Merge pull request #1277 from sdodson/aou-oa

Switch from installing atomic-openshift-utils to openshift-ansible
openshift-eng · Apr 5, 2018 · cdca49d · cdca49d
2 parents a151b1d + 2f4b336
commit cdca49d
Show file tree

Hide file tree

Showing 77 changed files with 158 additions and 158 deletions.
diff --git a/sjb/config/common/test_cases/origin_built_installed_release.yml b/sjb/config/common/test_cases/origin_built_installed_release.yml
@@ -14,8 +14,8 @@ extensions:
         if [[ "${PULL_BASE_REF}" == "release-3.7" || "${PULL_BASE_REF}" == "release-3.6" || "${PULL_BASE_REF}" == "release-3.5"  ]]; then
           sudo yum downgrade -y ansible-2.3\*
         fi
-        sudo yum install -y "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
-        rpm -V "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        sudo yum install -y "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        rpm -V "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
     - type: "script"
       title: "install Ansible plugins"
       timeout: 600

diff --git a/sjb/config/common/test_cases/origin_built_installed_release_36.yml b/sjb/config/common/test_cases/origin_built_installed_release_36.yml
@@ -14,8 +14,8 @@ extensions:
         if [[ "${PULL_BASE_REF}" == "release-3.7" || "${PULL_BASE_REF}" == "release-3.6" || "${PULL_BASE_REF}" == "release-3.5"  ]]; then
           sudo yum downgrade -y ansible-2.3\*
         fi
-        sudo yum install -y "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
-        rpm -V "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        sudo yum install -y "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        rpm -V "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
     - type: "script"
       title: "install Ansible plugins"
       timeout: 600

diff --git a/sjb/config/common/test_cases/origin_built_installed_release_37.yml b/sjb/config/common/test_cases/origin_built_installed_release_37.yml
@@ -14,8 +14,8 @@ extensions:
         if [[ "${PULL_BASE_REF}" == "release-3.7" || "${PULL_BASE_REF}" == "release-3.6" || "${PULL_BASE_REF}" == "release-3.5"  ]]; then
           sudo yum downgrade -y ansible-2.3\*
         fi
-        sudo yum install -y "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
-        rpm -V "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        sudo yum install -y "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        rpm -V "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
     - type: "script"
       title: "install Ansible plugins"
       timeout: 600

diff --git a/sjb/config/common/test_cases/origin_built_installed_release_38.yml b/sjb/config/common/test_cases/origin_built_installed_release_38.yml
@@ -14,8 +14,8 @@ extensions:
         if [[ "${PULL_BASE_REF}" == "release-3.7" || "${PULL_BASE_REF}" == "release-3.6" || "${PULL_BASE_REF}" == "release-3.5"  ]]; then
           sudo yum downgrade -y ansible-2.3\*
         fi
-        sudo yum install -y "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
-        rpm -V "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        sudo yum install -y "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        rpm -V "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
     - type: "script"
       title: "install Ansible plugins"
       timeout: 600

diff --git a/sjb/config/common/test_cases/origin_built_installed_release_39.yml b/sjb/config/common/test_cases/origin_built_installed_release_39.yml
@@ -14,8 +14,8 @@ extensions:
         if [[ "${PULL_BASE_REF}" == "release-3.7" || "${PULL_BASE_REF}" == "release-3.6" || "${PULL_BASE_REF}" == "release-3.5"  ]]; then
           sudo yum downgrade -y ansible-2.3\*
         fi
-        sudo yum install -y "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
-        rpm -V "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        sudo yum install -y "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        rpm -V "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
     - type: "script"
       title: "install Ansible plugins"
       timeout: 600

diff --git a/sjb/config/common/test_cases/origin_installed_release.yml b/sjb/config/common/test_cases/origin_installed_release.yml
@@ -14,8 +14,8 @@ extensions:
         if [[ "${PULL_BASE_REF}" == "release-3.7" || "${PULL_BASE_REF}" == "release-3.6" || "${PULL_BASE_REF}" == "release-3.5"  ]]; then
           sudo yum downgrade -y ansible-2.3\*
         fi
-        sudo yum install -y "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
-        rpm -V "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        sudo yum install -y "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        rpm -V "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
     - type: "script"
       title: "install Ansible plugins"
       timeout: 600

diff --git a/sjb/config/test_cases/test_branch_origin_extended_conformance_crio.yml b/sjb/config/test_cases/test_branch_origin_extended_conformance_crio.yml
@@ -50,8 +50,8 @@ extensions:
         if [[ "${PULL_BASE_REF}" == "release-3.7" || "${PULL_BASE_REF}" == "release-3.6" || "${PULL_BASE_REF}" == "release-3.5"  ]]; then
           sudo yum downgrade -y ansible-2.3\*
         fi
-        sudo yum install -y "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
-        rpm -V "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        sudo yum install -y "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        rpm -V "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
     - type: "script"
       title: "install skopeo"
       timeout: 3600

diff --git a/sjb/config/test_cases/test_branch_origin_extended_conformance_install_containerized.yml b/sjb/config/test_cases/test_branch_origin_extended_conformance_install_containerized.yml
@@ -51,8 +51,8 @@ extensions:
         if [[ "${PULL_BASE_REF}" == "release-3.7" || "${PULL_BASE_REF}" == "release-3.6" || "${PULL_BASE_REF}" == "release-3.5"  ]]; then
           sudo yum downgrade -y ansible-2.3\*
         fi
-        sudo yum install -y "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
-        rpm -V "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        sudo yum install -y "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        rpm -V "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
     - type: "script"
       title: "install Ansible plugins"
       repository: "origin"

diff --git a/sjb/config/test_cases/test_branch_origin_extended_conformance_install_in_tree.yml b/sjb/config/test_cases/test_branch_origin_extended_conformance_install_in_tree.yml
@@ -49,8 +49,8 @@ extensions:
         if [[ "${PULL_BASE_REF}" == "release-3.7" || "${PULL_BASE_REF}" == "release-3.6" || "${PULL_BASE_REF}" == "release-3.5"  ]]; then
           sudo yum downgrade -y ansible-2.3\*
         fi
-        sudo yum install -y "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
-        rpm -V "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        sudo yum install -y "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        rpm -V "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
     - type: "script"
       title: "install Ansible plugins"
       repository: "origin"

diff --git a/sjb/config/test_cases/test_branch_origin_extended_conformance_install_update.yml b/sjb/config/test_cases/test_branch_origin_extended_conformance_install_update.yml
@@ -55,9 +55,9 @@ extensions:
         name = OpenShift Ansible Release from Local Source
         EOR
         sudo cp ./openshift-ansible-local-release.repo /etc/yum.repos.d
-        basename "${tito_tmp_dir}"/noarch/atomic-openshift-utils*.rpm .rpm > /data/src/github.com/openshift/aos-cd-jobs/OPENSHIFT_ANSIBLE_BUILT_VERSION
+        basename "${tito_tmp_dir}"/noarch/openshift-ansible*.rpm .rpm > /data/src/github.com/openshift/aos-cd-jobs/OPENSHIFT_ANSIBLE_BUILT_VERSION
     - type: "script"
-      title: "install ansible atomic-openshift-utils"
+      title: "install ansible openshift-ansible"
       repository: "aos-cd-jobs"
       timeout: 600
       script: |-
@@ -77,7 +77,7 @@ extensions:
         do
           versioned_packages_to_install+=" ${pkg}-${ATOMIC_OPENSHIFT_UTILS_INSTALL_VERSION}"
         done
-        echo "=== Installing atomic-openshift-utils-${ATOMIC_OPENSHIFT_UTILS_INSTALL_VERSION} packages ==="
+        echo "=== Installing openshift-ansible-${ATOMIC_OPENSHIFT_UTILS_INSTALL_VERSION} packages ==="
         sudo yum install -y ${versioned_packages_to_install}
     - type: "script"
       title: "install Ansible plugins"

diff --git a/...onfig/test_cases/test_branch_origin_extended_conformance_install_update_containerized.yml b/...onfig/test_cases/test_branch_origin_extended_conformance_install_update_containerized.yml
@@ -51,8 +51,8 @@ extensions:
         if [[ "${PULL_BASE_REF}" == "release-3.7" || "${PULL_BASE_REF}" == "release-3.6" || "${PULL_BASE_REF}" == "release-3.5"  ]]; then
           sudo yum downgrade -y ansible-2.3\*
         fi
-        sudo yum install -y "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
-        rpm -V "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        sudo yum install -y "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        rpm -V "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
     - type: "script"
       title: "install Ansible plugins"
       repository: "origin"

diff --git a/...g/test_cases/test_branch_origin_extended_conformance_install_update_system_containers.yml b/...g/test_cases/test_branch_origin_extended_conformance_install_update_system_containers.yml
@@ -69,8 +69,8 @@ extensions:
 
         last_tag="$( git describe --tags --abbrev=0 --exact-match HEAD )"
         last_commit="$( git log -n 1 --pretty=%h )"
-        sudo yum install -y "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
-        rpm -V "atomic-openshift-utils${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        sudo yum install -y "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
+        rpm -V "openshift-ansible${last_tag/openshift-ansible/}.git.0.${last_commit}.el7"
     - type: "script"
       title: "install Ansible plugins"
       repository: "origin"

diff --git a/sjb/generated/test_branch_image_registry_extended.xml b/sjb/generated/test_branch_image_registry_extended.xml
@@ -420,8 +420,8 @@ last_commit=&#34;\$( git log -n 1 --pretty=%h )&#34;
 if [[ &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.7&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.6&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.5&#34;  ]]; then
   sudo yum downgrade -y ansible-2.3\*
 fi
-sudo yum install -y &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
-rpm -V &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+sudo yum install -y &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+rpm -V &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
 SCRIPT
 chmod +x &#34;${script}&#34;
 scp -F ./.config/origin-ci-tool/inventory/.ssh_config &#34;${script}&#34; openshiftdevel:&#34;${script}&#34;

diff --git a/sjb/generated/test_branch_jenkins_client_plugin.xml b/sjb/generated/test_branch_jenkins_client_plugin.xml
@@ -276,8 +276,8 @@ last_commit=&#34;\$( git log -n 1 --pretty=%h )&#34;
 if [[ &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.7&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.6&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.5&#34;  ]]; then
   sudo yum downgrade -y ansible-2.3\*
 fi
-sudo yum install -y &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
-rpm -V &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+sudo yum install -y &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+rpm -V &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
 SCRIPT
 chmod +x &#34;${script}&#34;
 scp -F ./.config/origin-ci-tool/inventory/.ssh_config &#34;${script}&#34; openshiftdevel:&#34;${script}&#34;

diff --git a/sjb/generated/test_branch_jenkins_openshift_login_plugin.xml b/sjb/generated/test_branch_jenkins_openshift_login_plugin.xml
@@ -276,8 +276,8 @@ last_commit=&#34;\$( git log -n 1 --pretty=%h )&#34;
 if [[ &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.7&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.6&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.5&#34;  ]]; then
   sudo yum downgrade -y ansible-2.3\*
 fi
-sudo yum install -y &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
-rpm -V &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+sudo yum install -y &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+rpm -V &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
 SCRIPT
 chmod +x &#34;${script}&#34;
 scp -F ./.config/origin-ci-tool/inventory/.ssh_config &#34;${script}&#34; openshiftdevel:&#34;${script}&#34;

diff --git a/sjb/generated/test_branch_jenkins_plugin.xml b/sjb/generated/test_branch_jenkins_plugin.xml
@@ -276,8 +276,8 @@ last_commit=&#34;\$( git log -n 1 --pretty=%h )&#34;
 if [[ &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.7&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.6&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.5&#34;  ]]; then
   sudo yum downgrade -y ansible-2.3\*
 fi
-sudo yum install -y &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
-rpm -V &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+sudo yum install -y &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+rpm -V &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
 SCRIPT
 chmod +x &#34;${script}&#34;
 scp -F ./.config/origin-ci-tool/inventory/.ssh_config &#34;${script}&#34; openshiftdevel:&#34;${script}&#34;

diff --git a/sjb/generated/test_branch_jenkins_sync_plugin.xml b/sjb/generated/test_branch_jenkins_sync_plugin.xml
@@ -276,8 +276,8 @@ last_commit=&#34;\$( git log -n 1 --pretty=%h )&#34;
 if [[ &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.7&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.6&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.5&#34;  ]]; then
   sudo yum downgrade -y ansible-2.3\*
 fi
-sudo yum install -y &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
-rpm -V &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+sudo yum install -y &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+rpm -V &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
 SCRIPT
 chmod +x &#34;${script}&#34;
 scp -F ./.config/origin-ci-tool/inventory/.ssh_config &#34;${script}&#34; openshiftdevel:&#34;${script}&#34;

diff --git a/sjb/generated/test_branch_openshift_ansible_logging.xml b/sjb/generated/test_branch_openshift_ansible_logging.xml
@@ -435,8 +435,8 @@ last_commit=&#34;\$( git log -n 1 --pretty=%h )&#34;
 if [[ &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.7&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.6&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.5&#34;  ]]; then
   sudo yum downgrade -y ansible-2.3\*
 fi
-sudo yum install -y &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
-rpm -V &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+sudo yum install -y &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+rpm -V &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
 SCRIPT
 chmod +x &#34;${script}&#34;
 scp -F ./.config/origin-ci-tool/inventory/.ssh_config &#34;${script}&#34; openshiftdevel:&#34;${script}&#34;

diff --git a/sjb/generated/test_branch_openshift_ansible_logging_json_file.xml b/sjb/generated/test_branch_openshift_ansible_logging_json_file.xml
@@ -435,8 +435,8 @@ last_commit=&#34;\$( git log -n 1 --pretty=%h )&#34;
 if [[ &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.7&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.6&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.5&#34;  ]]; then
   sudo yum downgrade -y ansible-2.3\*
 fi
-sudo yum install -y &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
-rpm -V &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+sudo yum install -y &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+rpm -V &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
 SCRIPT
 chmod +x &#34;${script}&#34;
 scp -F ./.config/origin-ci-tool/inventory/.ssh_config &#34;${script}&#34; openshiftdevel:&#34;${script}&#34;

diff --git a/sjb/generated/test_branch_origin_aggregated_logging_json_file.xml b/sjb/generated/test_branch_origin_aggregated_logging_json_file.xml
@@ -435,8 +435,8 @@ last_commit=&#34;\$( git log -n 1 --pretty=%h )&#34;
 if [[ &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.7&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.6&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.5&#34;  ]]; then
   sudo yum downgrade -y ansible-2.3\*
 fi
-sudo yum install -y &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
-rpm -V &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+sudo yum install -y &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+rpm -V &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
 SCRIPT
 chmod +x &#34;${script}&#34;
 scp -F ./.config/origin-ci-tool/inventory/.ssh_config &#34;${script}&#34; openshiftdevel:&#34;${script}&#34;

diff --git a/sjb/generated/test_branch_origin_extended_builds.xml b/sjb/generated/test_branch_origin_extended_builds.xml
@@ -276,8 +276,8 @@ last_commit=&#34;\$( git log -n 1 --pretty=%h )&#34;
 if [[ &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.7&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.6&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.5&#34;  ]]; then
   sudo yum downgrade -y ansible-2.3\*
 fi
-sudo yum install -y &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
-rpm -V &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+sudo yum install -y &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+rpm -V &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
 SCRIPT
 chmod +x &#34;${script}&#34;
 scp -F ./.config/origin-ci-tool/inventory/.ssh_config &#34;${script}&#34; openshiftdevel:&#34;${script}&#34;

diff --git a/sjb/generated/test_branch_origin_extended_conformance_crio.xml b/sjb/generated/test_branch_origin_extended_conformance_crio.xml
@@ -320,8 +320,8 @@ last_commit=&#34;\$( git log -n 1 --pretty=%h )&#34;
 if [[ &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.7&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.6&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.5&#34;  ]]; then
   sudo yum downgrade -y ansible-2.3\*
 fi
-sudo yum install -y &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
-rpm -V &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+sudo yum install -y &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+rpm -V &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
 SCRIPT
 chmod +x &#34;${script}&#34;
 scp -F ./.config/origin-ci-tool/inventory/.ssh_config &#34;${script}&#34; openshiftdevel:&#34;${script}&#34;

diff --git a/sjb/generated/test_branch_origin_extended_conformance_install.xml b/sjb/generated/test_branch_origin_extended_conformance_install.xml
@@ -420,8 +420,8 @@ last_commit=&#34;\$( git log -n 1 --pretty=%h )&#34;
 if [[ &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.7&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.6&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.5&#34;  ]]; then
   sudo yum downgrade -y ansible-2.3\*
 fi
-sudo yum install -y &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
-rpm -V &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+sudo yum install -y &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+rpm -V &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
 SCRIPT
 chmod +x &#34;${script}&#34;
 scp -F ./.config/origin-ci-tool/inventory/.ssh_config &#34;${script}&#34; openshiftdevel:&#34;${script}&#34;

diff --git a/sjb/generated/test_branch_origin_extended_conformance_install_36.xml b/sjb/generated/test_branch_origin_extended_conformance_install_36.xml
@@ -356,8 +356,8 @@ last_commit=&#34;\$( git log -n 1 --pretty=%h )&#34;
 if [[ &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.7&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.6&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.5&#34;  ]]; then
   sudo yum downgrade -y ansible-2.3\*
 fi
-sudo yum install -y &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
-rpm -V &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+sudo yum install -y &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+rpm -V &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
 SCRIPT
 chmod +x &#34;${script}&#34;
 scp -F ./.config/origin-ci-tool/inventory/.ssh_config &#34;${script}&#34; openshiftdevel:&#34;${script}&#34;

diff --git a/sjb/generated/test_branch_origin_extended_conformance_install_37.xml b/sjb/generated/test_branch_origin_extended_conformance_install_37.xml
@@ -356,8 +356,8 @@ last_commit=&#34;\$( git log -n 1 --pretty=%h )&#34;
 if [[ &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.7&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.6&#34; || &#34;\${PULL_BASE_REF}&#34; == &#34;release-3.5&#34;  ]]; then
   sudo yum downgrade -y ansible-2.3\*
 fi
-sudo yum install -y &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
-rpm -V &#34;atomic-openshift-utils\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+sudo yum install -y &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
+rpm -V &#34;openshift-ansible\${last_tag/openshift-ansible/}.git.0.\${last_commit}.el7&#34;
 SCRIPT
 chmod +x &#34;${script}&#34;
 scp -F ./.config/origin-ci-tool/inventory/.ssh_config &#34;${script}&#34; openshiftdevel:&#34;${script}&#34;