diff --git a/sjb/config/common/test_cases/origin_built_installed_release.yml b/sjb/config/common/test_cases/origin_built_installed_release.yml index c4fa2f89d3..06cb7817b3 100644 --- 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 index bbfda146b2..694e2361e2 100644 --- 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 index f381302121..29eaac9d9c 100644 --- 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 index d9c49d494d..ec475660c6 100644 --- 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 index 6c92ffd5f1..b526cc76ea 100644 --- 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 index 36c4edc6ce..be2c9583a8 100644 --- 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 index a09d40ae60..bd94f6da3a 100644 --- 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 index a4fac14ced..11d3b73090 100644 --- 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 index b5dbf8047c..1f248672c0 100644 --- 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 index c645cb581a..7c60dd5b39 100644 --- 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/sjb/config/test_cases/test_branch_origin_extended_conformance_install_update_containerized.yml b/sjb/config/test_cases/test_branch_origin_extended_conformance_install_update_containerized.yml index 414247d9a8..c278cbebe1 100644 --- a/sjb/config/test_cases/test_branch_origin_extended_conformance_install_update_containerized.yml +++ b/sjb/config/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/sjb/config/test_cases/test_branch_origin_extended_conformance_install_update_system_containers.yml b/sjb/config/test_cases/test_branch_origin_extended_conformance_install_update_system_containers.yml index 0b0f4e838a..e5569ce2b2 100644 --- a/sjb/config/test_cases/test_branch_origin_extended_conformance_install_update_system_containers.yml +++ b/sjb/config/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 index f8462b4f98..46f1a6fc55 100644 --- a/sjb/generated/test_branch_image_registry_extended.xml +++ b/sjb/generated/test_branch_image_registry_extended.xml @@ -420,8 +420,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_jenkins_client_plugin.xml b/sjb/generated/test_branch_jenkins_client_plugin.xml index 85338d817c..fe497e838c 100644 --- a/sjb/generated/test_branch_jenkins_client_plugin.xml +++ b/sjb/generated/test_branch_jenkins_client_plugin.xml @@ -276,8 +276,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_jenkins_openshift_login_plugin.xml b/sjb/generated/test_branch_jenkins_openshift_login_plugin.xml index 3434daa2f6..e5a1c1390e 100644 --- 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="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_jenkins_plugin.xml b/sjb/generated/test_branch_jenkins_plugin.xml index 08825f7d04..33868d7a2c 100644 --- a/sjb/generated/test_branch_jenkins_plugin.xml +++ b/sjb/generated/test_branch_jenkins_plugin.xml @@ -276,8 +276,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_jenkins_sync_plugin.xml b/sjb/generated/test_branch_jenkins_sync_plugin.xml index 1195022c84..75db2fe107 100644 --- a/sjb/generated/test_branch_jenkins_sync_plugin.xml +++ b/sjb/generated/test_branch_jenkins_sync_plugin.xml @@ -276,8 +276,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_openshift_ansible_logging.xml b/sjb/generated/test_branch_openshift_ansible_logging.xml index b86b6b64c0..e4a58568fd 100644 --- a/sjb/generated/test_branch_openshift_ansible_logging.xml +++ b/sjb/generated/test_branch_openshift_ansible_logging.xml @@ -435,8 +435,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_openshift_ansible_logging_json_file.xml b/sjb/generated/test_branch_openshift_ansible_logging_json_file.xml index fda62ea420..40d86c9fd4 100644 --- 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="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_origin_aggregated_logging_json_file.xml b/sjb/generated/test_branch_origin_aggregated_logging_json_file.xml index 012cf5d865..75eaee4a45 100644 --- 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="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_origin_extended_builds.xml b/sjb/generated/test_branch_origin_extended_builds.xml index b0863cc786..da5728a6c2 100644 --- a/sjb/generated/test_branch_origin_extended_builds.xml +++ b/sjb/generated/test_branch_origin_extended_builds.xml @@ -276,8 +276,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_origin_extended_conformance_crio.xml b/sjb/generated/test_branch_origin_extended_conformance_crio.xml index 307342e426..78f43c060f 100644 --- 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="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_origin_extended_conformance_install.xml b/sjb/generated/test_branch_origin_extended_conformance_install.xml index 55dc5783e1..e3628e5fa0 100644 --- 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="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_origin_extended_conformance_install_36.xml b/sjb/generated/test_branch_origin_extended_conformance_install_36.xml index 1f4bb1c4a4..cfc6dff97b 100644 --- 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="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_origin_extended_conformance_install_37.xml b/sjb/generated/test_branch_origin_extended_conformance_install_37.xml index c436584369..05ae4609af 100644 --- 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="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_origin_extended_conformance_install_38.xml b/sjb/generated/test_branch_origin_extended_conformance_install_38.xml index 3177ac7af4..f5ef20c5a0 100644 --- a/sjb/generated/test_branch_origin_extended_conformance_install_38.xml +++ b/sjb/generated/test_branch_origin_extended_conformance_install_38.xml @@ -403,8 +403,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_origin_extended_conformance_install_39.xml b/sjb/generated/test_branch_origin_extended_conformance_install_39.xml index 10f54aa903..a626eece32 100644 --- a/sjb/generated/test_branch_origin_extended_conformance_install_39.xml +++ b/sjb/generated/test_branch_origin_extended_conformance_install_39.xml @@ -420,8 +420,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_origin_extended_conformance_install_containerized.xml b/sjb/generated/test_branch_origin_extended_conformance_install_containerized.xml index 81c00afbea..1e5c026056 100644 --- a/sjb/generated/test_branch_origin_extended_conformance_install_containerized.xml +++ b/sjb/generated/test_branch_origin_extended_conformance_install_containerized.xml @@ -326,8 +326,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_origin_extended_conformance_install_in_tree.xml b/sjb/generated/test_branch_origin_extended_conformance_install_in_tree.xml index 8adfe17838..9770868018 100644 --- a/sjb/generated/test_branch_origin_extended_conformance_install_in_tree.xml +++ b/sjb/generated/test_branch_origin_extended_conformance_install_in_tree.xml @@ -324,8 +324,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_origin_extended_conformance_install_system_containers.xml b/sjb/generated/test_branch_origin_extended_conformance_install_system_containers.xml index a96ef3dc67..d9c3122015 100644 --- a/sjb/generated/test_branch_origin_extended_conformance_install_system_containers.xml +++ b/sjb/generated/test_branch_origin_extended_conformance_install_system_containers.xml @@ -440,8 +440,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_origin_extended_conformance_install_update.xml b/sjb/generated/test_branch_origin_extended_conformance_install_update.xml index 18ccf29059..8098809dc4 100644 --- a/sjb/generated/test_branch_origin_extended_conformance_install_update.xml +++ b/sjb/generated/test_branch_origin_extended_conformance_install_update.xml @@ -342,7 +342,7 @@ gpgcheck = 0 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 SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" @@ -350,7 +350,7 @@ ssh -F ./.config/origin-ci-tool/inventory/.ssh_config -t openshiftdevel "bas #!/bin/bash -SCRIPT_START_TIME="$( date +%s )" && export SCRIPT_START_TIME && echo "########## STARTING STAGE: INSTALL ANSIBLE ATOMIC-OPENSHIFT-UTILS ##########" && trap 'export status=FAILURE' ERR && trap 'set +o xtrace; SCRIPT_END_TIME="$( date +%s )"; ELAPSED_TIME="$(( SCRIPT_END_TIME - SCRIPT_START_TIME ))"; echo "########## FINISHED STAGE: ${status:-SUCCESS}: INSTALL ANSIBLE ATOMIC-OPENSHIFT-UTILS [$( printf "%02dh %02dm %02ds" "$(( ELAPSED_TIME/3600 ))" "$(( (ELAPSED_TIME%3600)/60 ))" "$(( ELAPSED_TIME%60 ))" )] ##########"' EXIT && set -o errexit -o nounset -o pipefail -o xtrace && if [[ -s "${WORKSPACE}/activate" ]]; then source "${WORKSPACE}/activate"; fi +SCRIPT_START_TIME="$( date +%s )" && export SCRIPT_START_TIME && echo "########## STARTING STAGE: INSTALL ANSIBLE OPENSHIFT-ANSIBLE ##########" && trap 'export status=FAILURE' ERR && trap 'set +o xtrace; SCRIPT_END_TIME="$( date +%s )"; ELAPSED_TIME="$(( SCRIPT_END_TIME - SCRIPT_START_TIME ))"; echo "########## FINISHED STAGE: ${status:-SUCCESS}: INSTALL ANSIBLE OPENSHIFT-ANSIBLE [$( printf "%02dh %02dm %02ds" "$(( ELAPSED_TIME/3600 ))" "$(( (ELAPSED_TIME%3600)/60 ))" "$(( ELAPSED_TIME%60 ))" )] ##########"' EXIT && set -o errexit -o nounset -o pipefail -o xtrace && if [[ -s "${WORKSPACE}/activate" ]]; then source "${WORKSPACE}/activate"; fi script="$( mktemp )" cat <<SCRIPT >"${script}" #!/bin/bash @@ -372,7 +372,7 @@ for pkg in "\${packages_to_install[@]}" 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} SCRIPT chmod +x "${script}" diff --git a/sjb/generated/test_branch_origin_extended_conformance_install_update_containerized.xml b/sjb/generated/test_branch_origin_extended_conformance_install_update_containerized.xml index 762ad6aa62..f0317a9109 100644 --- a/sjb/generated/test_branch_origin_extended_conformance_install_update_containerized.xml +++ b/sjb/generated/test_branch_origin_extended_conformance_install_update_containerized.xml @@ -326,8 +326,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_origin_extended_conformance_install_update_system_containers.xml b/sjb/generated/test_branch_origin_extended_conformance_install_update_system_containers.xml index a4bb6b4c26..e8b49950ca 100644 --- a/sjb/generated/test_branch_origin_extended_conformance_install_update_system_containers.xml +++ b/sjb/generated/test_branch_origin_extended_conformance_install_update_system_containers.xml @@ -346,8 +346,8 @@ fi 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_origin_extended_image_ecosystem.xml b/sjb/generated/test_branch_origin_extended_image_ecosystem.xml index 8b6112cda4..6922248277 100644 --- a/sjb/generated/test_branch_origin_extended_image_ecosystem.xml +++ b/sjb/generated/test_branch_origin_extended_image_ecosystem.xml @@ -276,8 +276,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_branch_origin_extended_image_registry.xml b/sjb/generated/test_branch_origin_extended_image_registry.xml index 11e7704efc..2d86b89184 100644 --- a/sjb/generated/test_branch_origin_extended_image_registry.xml +++ b/sjb/generated/test_branch_origin_extended_image_registry.xml @@ -276,8 +276,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_image_registry_extended.xml b/sjb/generated/test_pull_request_image_registry_extended.xml index f8462b4f98..46f1a6fc55 100644 --- a/sjb/generated/test_pull_request_image_registry_extended.xml +++ b/sjb/generated/test_pull_request_image_registry_extended.xml @@ -420,8 +420,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_jenkins_client_plugin.xml b/sjb/generated/test_pull_request_jenkins_client_plugin.xml index 85338d817c..fe497e838c 100644 --- a/sjb/generated/test_pull_request_jenkins_client_plugin.xml +++ b/sjb/generated/test_pull_request_jenkins_client_plugin.xml @@ -276,8 +276,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_jenkins_openshift_login_plugin.xml b/sjb/generated/test_pull_request_jenkins_openshift_login_plugin.xml index 3434daa2f6..e5a1c1390e 100644 --- a/sjb/generated/test_pull_request_jenkins_openshift_login_plugin.xml +++ b/sjb/generated/test_pull_request_jenkins_openshift_login_plugin.xml @@ -276,8 +276,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_jenkins_plugin.xml b/sjb/generated/test_pull_request_jenkins_plugin.xml index 08825f7d04..33868d7a2c 100644 --- a/sjb/generated/test_pull_request_jenkins_plugin.xml +++ b/sjb/generated/test_pull_request_jenkins_plugin.xml @@ -276,8 +276,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_jenkins_sync_plugin.xml b/sjb/generated/test_pull_request_jenkins_sync_plugin.xml index 1195022c84..75db2fe107 100644 --- a/sjb/generated/test_pull_request_jenkins_sync_plugin.xml +++ b/sjb/generated/test_pull_request_jenkins_sync_plugin.xml @@ -276,8 +276,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install.xml b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install.xml index a013d768f1..3254e50f40 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install.xml @@ -420,8 +420,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_containerized.xml b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_containerized.xml index 7f402e3616..d335b40818 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_containerized.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_containerized.xml @@ -326,8 +326,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_crio.xml b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_crio.xml index 397ec31eaf..2021d16e4c 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_crio.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_crio.xml @@ -320,8 +320,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_in_tree.xml b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_in_tree.xml index 4a063f508f..2d2c7e04a4 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_in_tree.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_in_tree.xml @@ -324,8 +324,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_release_36.xml b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_release_36.xml index d021f86b45..7a1f64166d 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_release_36.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_release_36.xml @@ -420,8 +420,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_release_37.xml b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_release_37.xml index 33de170731..26437ba2e4 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_release_37.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_release_37.xml @@ -420,8 +420,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_release_39.xml b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_release_39.xml index caa89857de..197b295a70 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_release_39.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_release_39.xml @@ -420,8 +420,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_system_containers.xml b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_system_containers.xml index 31d61fee1c..2bd152b3de 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_system_containers.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_system_containers.xml @@ -440,8 +440,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_system_containers_36.xml b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_system_containers_36.xml index a7d216f614..7a6fa26c1b 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_system_containers_36.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_system_containers_36.xml @@ -440,8 +440,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_system_containers_37.xml b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_system_containers_37.xml index ba204e5f0b..3cb1715452 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_system_containers_37.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_system_containers_37.xml @@ -440,8 +440,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_system_containers_39.xml b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_system_containers_39.xml index 86395c8668..048646c870 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_system_containers_39.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_system_containers_39.xml @@ -440,8 +440,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_update.xml b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_update.xml index 5c608fddec..b2cfdf8afa 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_update.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_update.xml @@ -342,7 +342,7 @@ gpgcheck = 0 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 SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" @@ -350,7 +350,7 @@ ssh -F ./.config/origin-ci-tool/inventory/.ssh_config -t openshiftdevel "bas #!/bin/bash -SCRIPT_START_TIME="$( date +%s )" && export SCRIPT_START_TIME && echo "########## STARTING STAGE: INSTALL ANSIBLE ATOMIC-OPENSHIFT-UTILS ##########" && trap 'export status=FAILURE' ERR && trap 'set +o xtrace; SCRIPT_END_TIME="$( date +%s )"; ELAPSED_TIME="$(( SCRIPT_END_TIME - SCRIPT_START_TIME ))"; echo "########## FINISHED STAGE: ${status:-SUCCESS}: INSTALL ANSIBLE ATOMIC-OPENSHIFT-UTILS [$( printf "%02dh %02dm %02ds" "$(( ELAPSED_TIME/3600 ))" "$(( (ELAPSED_TIME%3600)/60 ))" "$(( ELAPSED_TIME%60 ))" )] ##########"' EXIT && set -o errexit -o nounset -o pipefail -o xtrace && if [[ -s "${WORKSPACE}/activate" ]]; then source "${WORKSPACE}/activate"; fi +SCRIPT_START_TIME="$( date +%s )" && export SCRIPT_START_TIME && echo "########## STARTING STAGE: INSTALL ANSIBLE OPENSHIFT-ANSIBLE ##########" && trap 'export status=FAILURE' ERR && trap 'set +o xtrace; SCRIPT_END_TIME="$( date +%s )"; ELAPSED_TIME="$(( SCRIPT_END_TIME - SCRIPT_START_TIME ))"; echo "########## FINISHED STAGE: ${status:-SUCCESS}: INSTALL ANSIBLE OPENSHIFT-ANSIBLE [$( printf "%02dh %02dm %02ds" "$(( ELAPSED_TIME/3600 ))" "$(( (ELAPSED_TIME%3600)/60 ))" "$(( ELAPSED_TIME%60 ))" )] ##########"' EXIT && set -o errexit -o nounset -o pipefail -o xtrace && if [[ -s "${WORKSPACE}/activate" ]]; then source "${WORKSPACE}/activate"; fi script="$( mktemp )" cat <<SCRIPT >"${script}" #!/bin/bash @@ -372,7 +372,7 @@ for pkg in "\${packages_to_install[@]}" 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} SCRIPT chmod +x "${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_update_containerized.xml b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_update_containerized.xml index 4c9dcab433..91b33dd39a 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_update_containerized.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_update_containerized.xml @@ -326,8 +326,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_update_system_containers.xml b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_update_system_containers.xml index a4bb6b4c26..e8b49950ca 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_update_system_containers.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_update_system_containers.xml @@ -346,8 +346,8 @@ fi 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_with_status_check.xml b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_with_status_check.xml index 4ce46a33ad..27c155e1df 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_with_status_check.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_extended_conformance_install_with_status_check.xml @@ -420,8 +420,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_logging.xml b/sjb/generated/test_pull_request_openshift_ansible_logging.xml index b86b6b64c0..e4a58568fd 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_logging.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_logging.xml @@ -435,8 +435,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_logging_36.xml b/sjb/generated/test_pull_request_openshift_ansible_logging_36.xml index 4c0e6b3a9c..609c9b5685 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_logging_36.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_logging_36.xml @@ -435,8 +435,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_logging_37.xml b/sjb/generated/test_pull_request_openshift_ansible_logging_37.xml index 8f5f380983..8740b1e3c9 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_logging_37.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_logging_37.xml @@ -435,8 +435,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_openshift_ansible_logging_39.xml b/sjb/generated/test_pull_request_openshift_ansible_logging_39.xml index 36988a62c5..9a7cd87cb8 100644 --- a/sjb/generated/test_pull_request_openshift_ansible_logging_39.xml +++ b/sjb/generated/test_pull_request_openshift_ansible_logging_39.xml @@ -435,8 +435,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_aggregated_logging_journald.xml b/sjb/generated/test_pull_request_origin_aggregated_logging_journald.xml index e53afe184f..f2b9ed3191 100644 --- a/sjb/generated/test_pull_request_origin_aggregated_logging_journald.xml +++ b/sjb/generated/test_pull_request_origin_aggregated_logging_journald.xml @@ -435,8 +435,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_aggregated_logging_journald_36.xml b/sjb/generated/test_pull_request_origin_aggregated_logging_journald_36.xml index acca4418f4..44b81a420e 100644 --- a/sjb/generated/test_pull_request_origin_aggregated_logging_journald_36.xml +++ b/sjb/generated/test_pull_request_origin_aggregated_logging_journald_36.xml @@ -435,8 +435,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_aggregated_logging_journald_37.xml b/sjb/generated/test_pull_request_origin_aggregated_logging_journald_37.xml index f6b263762a..da136a4ba1 100644 --- a/sjb/generated/test_pull_request_origin_aggregated_logging_journald_37.xml +++ b/sjb/generated/test_pull_request_origin_aggregated_logging_journald_37.xml @@ -435,8 +435,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_aggregated_logging_journald_39.xml b/sjb/generated/test_pull_request_origin_aggregated_logging_journald_39.xml index 55b2dc89b5..6697f7c826 100644 --- a/sjb/generated/test_pull_request_origin_aggregated_logging_journald_39.xml +++ b/sjb/generated/test_pull_request_origin_aggregated_logging_journald_39.xml @@ -435,8 +435,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_aggregated_logging_json_file.xml b/sjb/generated/test_pull_request_origin_aggregated_logging_json_file.xml index 012cf5d865..75eaee4a45 100644 --- a/sjb/generated/test_pull_request_origin_aggregated_logging_json_file.xml +++ b/sjb/generated/test_pull_request_origin_aggregated_logging_json_file.xml @@ -435,8 +435,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_aggregated_logging_json_file_36.xml b/sjb/generated/test_pull_request_origin_aggregated_logging_json_file_36.xml index 6f4356d1ae..1f39b62ecc 100644 --- a/sjb/generated/test_pull_request_origin_aggregated_logging_json_file_36.xml +++ b/sjb/generated/test_pull_request_origin_aggregated_logging_json_file_36.xml @@ -435,8 +435,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_aggregated_logging_json_file_37.xml b/sjb/generated/test_pull_request_origin_aggregated_logging_json_file_37.xml index 83197807bf..18eb9b2857 100644 --- a/sjb/generated/test_pull_request_origin_aggregated_logging_json_file_37.xml +++ b/sjb/generated/test_pull_request_origin_aggregated_logging_json_file_37.xml @@ -435,8 +435,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_aggregated_logging_json_file_39.xml b/sjb/generated/test_pull_request_origin_aggregated_logging_json_file_39.xml index 36dedb9b1b..14a8bc5062 100644 --- a/sjb/generated/test_pull_request_origin_aggregated_logging_json_file_39.xml +++ b/sjb/generated/test_pull_request_origin_aggregated_logging_json_file_39.xml @@ -435,8 +435,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_extended_builds.xml b/sjb/generated/test_pull_request_origin_extended_builds.xml index 0905fe3ab7..c3c8957071 100644 --- a/sjb/generated/test_pull_request_origin_extended_builds.xml +++ b/sjb/generated/test_pull_request_origin_extended_builds.xml @@ -420,8 +420,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_extended_conformance_crio.xml b/sjb/generated/test_pull_request_origin_extended_conformance_crio.xml index 307342e426..78f43c060f 100644 --- a/sjb/generated/test_pull_request_origin_extended_conformance_crio.xml +++ b/sjb/generated/test_pull_request_origin_extended_conformance_crio.xml @@ -320,8 +320,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_extended_conformance_install.xml b/sjb/generated/test_pull_request_origin_extended_conformance_install.xml index 55dc5783e1..e3628e5fa0 100644 --- a/sjb/generated/test_pull_request_origin_extended_conformance_install.xml +++ b/sjb/generated/test_pull_request_origin_extended_conformance_install.xml @@ -420,8 +420,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_extended_conformance_install_36.xml b/sjb/generated/test_pull_request_origin_extended_conformance_install_36.xml index 40ce39691c..5092e3876a 100644 --- a/sjb/generated/test_pull_request_origin_extended_conformance_install_36.xml +++ b/sjb/generated/test_pull_request_origin_extended_conformance_install_36.xml @@ -356,8 +356,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_extended_conformance_install_37.xml b/sjb/generated/test_pull_request_origin_extended_conformance_install_37.xml index 33216c60f8..314533b435 100644 --- a/sjb/generated/test_pull_request_origin_extended_conformance_install_37.xml +++ b/sjb/generated/test_pull_request_origin_extended_conformance_install_37.xml @@ -356,8 +356,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_extended_conformance_install_38.xml b/sjb/generated/test_pull_request_origin_extended_conformance_install_38.xml index 90189e72b6..c313c7d957 100644 --- a/sjb/generated/test_pull_request_origin_extended_conformance_install_38.xml +++ b/sjb/generated/test_pull_request_origin_extended_conformance_install_38.xml @@ -403,8 +403,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_extended_conformance_install_39.xml b/sjb/generated/test_pull_request_origin_extended_conformance_install_39.xml index 25b0cc8b58..f60b46ecfa 100644 --- a/sjb/generated/test_pull_request_origin_extended_conformance_install_39.xml +++ b/sjb/generated/test_pull_request_origin_extended_conformance_install_39.xml @@ -420,8 +420,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_extended_conformance_install_update.xml b/sjb/generated/test_pull_request_origin_extended_conformance_install_update.xml index 18ccf29059..8098809dc4 100644 --- a/sjb/generated/test_pull_request_origin_extended_conformance_install_update.xml +++ b/sjb/generated/test_pull_request_origin_extended_conformance_install_update.xml @@ -342,7 +342,7 @@ gpgcheck = 0 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 SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" @@ -350,7 +350,7 @@ ssh -F ./.config/origin-ci-tool/inventory/.ssh_config -t openshiftdevel "bas #!/bin/bash -SCRIPT_START_TIME="$( date +%s )" && export SCRIPT_START_TIME && echo "########## STARTING STAGE: INSTALL ANSIBLE ATOMIC-OPENSHIFT-UTILS ##########" && trap 'export status=FAILURE' ERR && trap 'set +o xtrace; SCRIPT_END_TIME="$( date +%s )"; ELAPSED_TIME="$(( SCRIPT_END_TIME - SCRIPT_START_TIME ))"; echo "########## FINISHED STAGE: ${status:-SUCCESS}: INSTALL ANSIBLE ATOMIC-OPENSHIFT-UTILS [$( printf "%02dh %02dm %02ds" "$(( ELAPSED_TIME/3600 ))" "$(( (ELAPSED_TIME%3600)/60 ))" "$(( ELAPSED_TIME%60 ))" )] ##########"' EXIT && set -o errexit -o nounset -o pipefail -o xtrace && if [[ -s "${WORKSPACE}/activate" ]]; then source "${WORKSPACE}/activate"; fi +SCRIPT_START_TIME="$( date +%s )" && export SCRIPT_START_TIME && echo "########## STARTING STAGE: INSTALL ANSIBLE OPENSHIFT-ANSIBLE ##########" && trap 'export status=FAILURE' ERR && trap 'set +o xtrace; SCRIPT_END_TIME="$( date +%s )"; ELAPSED_TIME="$(( SCRIPT_END_TIME - SCRIPT_START_TIME ))"; echo "########## FINISHED STAGE: ${status:-SUCCESS}: INSTALL ANSIBLE OPENSHIFT-ANSIBLE [$( printf "%02dh %02dm %02ds" "$(( ELAPSED_TIME/3600 ))" "$(( (ELAPSED_TIME%3600)/60 ))" "$(( ELAPSED_TIME%60 ))" )] ##########"' EXIT && set -o errexit -o nounset -o pipefail -o xtrace && if [[ -s "${WORKSPACE}/activate" ]]; then source "${WORKSPACE}/activate"; fi script="$( mktemp )" cat <<SCRIPT >"${script}" #!/bin/bash @@ -372,7 +372,7 @@ for pkg in "\${packages_to_install[@]}" 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} SCRIPT chmod +x "${script}" diff --git a/sjb/generated/test_pull_request_origin_extended_image_ecosystem.xml b/sjb/generated/test_pull_request_origin_extended_image_ecosystem.xml index 647604265f..e40c9e42b4 100644 --- a/sjb/generated/test_pull_request_origin_extended_image_ecosystem.xml +++ b/sjb/generated/test_pull_request_origin_extended_image_ecosystem.xml @@ -420,8 +420,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}" diff --git a/sjb/generated/test_pull_request_origin_extended_image_registry.xml b/sjb/generated/test_pull_request_origin_extended_image_registry.xml index 9214badeee..1e2f828329 100644 --- a/sjb/generated/test_pull_request_origin_extended_image_registry.xml +++ b/sjb/generated/test_pull_request_origin_extended_image_registry.xml @@ -420,8 +420,8 @@ last_commit="\$( git log -n 1 --pretty=%h )" 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" SCRIPT chmod +x "${script}" scp -F ./.config/origin-ci-tool/inventory/.ssh_config "${script}" openshiftdevel:"${script}"