From 2f4b336688d4c76b3bc01512be74da191ae41317 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Wed, 28 Mar 2018 17:57:24 -0400 Subject: [PATCH] Switch from installing atomic-openshift-utils to openshift-ansible --- .../common/test_cases/origin_built_installed_release.yml | 4 ++-- .../common/test_cases/origin_built_installed_release_36.yml | 4 ++-- .../common/test_cases/origin_built_installed_release_37.yml | 4 ++-- .../common/test_cases/origin_built_installed_release_38.yml | 4 ++-- .../common/test_cases/origin_built_installed_release_39.yml | 4 ++-- sjb/config/common/test_cases/origin_installed_release.yml | 4 ++-- .../test_branch_origin_extended_conformance_crio.yml | 4 ++-- ...ch_origin_extended_conformance_install_containerized.yml | 4 ++-- ...t_branch_origin_extended_conformance_install_in_tree.yml | 4 ++-- ...st_branch_origin_extended_conformance_install_update.yml | 6 +++--- ...in_extended_conformance_install_update_containerized.yml | 4 ++-- ...xtended_conformance_install_update_system_containers.yml | 4 ++-- sjb/generated/test_branch_image_registry_extended.xml | 4 ++-- sjb/generated/test_branch_jenkins_client_plugin.xml | 4 ++-- .../test_branch_jenkins_openshift_login_plugin.xml | 4 ++-- sjb/generated/test_branch_jenkins_plugin.xml | 4 ++-- sjb/generated/test_branch_jenkins_sync_plugin.xml | 4 ++-- sjb/generated/test_branch_openshift_ansible_logging.xml | 4 ++-- .../test_branch_openshift_ansible_logging_json_file.xml | 4 ++-- .../test_branch_origin_aggregated_logging_json_file.xml | 4 ++-- sjb/generated/test_branch_origin_extended_builds.xml | 4 ++-- .../test_branch_origin_extended_conformance_crio.xml | 4 ++-- .../test_branch_origin_extended_conformance_install.xml | 4 ++-- .../test_branch_origin_extended_conformance_install_36.xml | 4 ++-- .../test_branch_origin_extended_conformance_install_37.xml | 4 ++-- .../test_branch_origin_extended_conformance_install_38.xml | 4 ++-- .../test_branch_origin_extended_conformance_install_39.xml | 4 ++-- ...ch_origin_extended_conformance_install_containerized.xml | 4 ++-- ...t_branch_origin_extended_conformance_install_in_tree.xml | 4 ++-- ...rigin_extended_conformance_install_system_containers.xml | 4 ++-- ...st_branch_origin_extended_conformance_install_update.xml | 6 +++--- ...in_extended_conformance_install_update_containerized.xml | 4 ++-- ...xtended_conformance_install_update_system_containers.xml | 4 ++-- .../test_branch_origin_extended_image_ecosystem.xml | 4 ++-- .../test_branch_origin_extended_image_registry.xml | 4 ++-- sjb/generated/test_pull_request_image_registry_extended.xml | 4 ++-- sjb/generated/test_pull_request_jenkins_client_plugin.xml | 4 ++-- .../test_pull_request_jenkins_openshift_login_plugin.xml | 4 ++-- sjb/generated/test_pull_request_jenkins_plugin.xml | 4 ++-- sjb/generated/test_pull_request_jenkins_sync_plugin.xml | 4 ++-- ...quest_openshift_ansible_extended_conformance_install.xml | 4 ++-- ...t_ansible_extended_conformance_install_containerized.xml | 4 ++-- ..._openshift_ansible_extended_conformance_install_crio.xml | 4 ++-- ...enshift_ansible_extended_conformance_install_in_tree.xml | 4 ++-- ...hift_ansible_extended_conformance_install_release_36.xml | 4 ++-- ...hift_ansible_extended_conformance_install_release_37.xml | 4 ++-- ...hift_ansible_extended_conformance_install_release_39.xml | 4 ++-- ...sible_extended_conformance_install_system_containers.xml | 4 ++-- ...le_extended_conformance_install_system_containers_36.xml | 4 ++-- ...le_extended_conformance_install_system_containers_37.xml | 4 ++-- ...le_extended_conformance_install_system_containers_39.xml | 4 ++-- ...penshift_ansible_extended_conformance_install_update.xml | 6 +++--- ...le_extended_conformance_install_update_containerized.xml | 4 ++-- ...xtended_conformance_install_update_system_containers.xml | 4 ++-- ...sible_extended_conformance_install_with_status_check.xml | 4 ++-- .../test_pull_request_openshift_ansible_logging.xml | 4 ++-- .../test_pull_request_openshift_ansible_logging_36.xml | 4 ++-- .../test_pull_request_openshift_ansible_logging_37.xml | 4 ++-- .../test_pull_request_openshift_ansible_logging_39.xml | 4 ++-- ...test_pull_request_origin_aggregated_logging_journald.xml | 4 ++-- ...t_pull_request_origin_aggregated_logging_journald_36.xml | 4 ++-- ...t_pull_request_origin_aggregated_logging_journald_37.xml | 4 ++-- ...t_pull_request_origin_aggregated_logging_journald_39.xml | 4 ++-- ...est_pull_request_origin_aggregated_logging_json_file.xml | 4 ++-- ..._pull_request_origin_aggregated_logging_json_file_36.xml | 4 ++-- ..._pull_request_origin_aggregated_logging_json_file_37.xml | 4 ++-- ..._pull_request_origin_aggregated_logging_json_file_39.xml | 4 ++-- sjb/generated/test_pull_request_origin_extended_builds.xml | 4 ++-- .../test_pull_request_origin_extended_conformance_crio.xml | 4 ++-- ...est_pull_request_origin_extended_conformance_install.xml | 4 ++-- ..._pull_request_origin_extended_conformance_install_36.xml | 4 ++-- ..._pull_request_origin_extended_conformance_install_37.xml | 4 ++-- ..._pull_request_origin_extended_conformance_install_38.xml | 4 ++-- ..._pull_request_origin_extended_conformance_install_39.xml | 4 ++-- ...l_request_origin_extended_conformance_install_update.xml | 6 +++--- .../test_pull_request_origin_extended_image_ecosystem.xml | 4 ++-- .../test_pull_request_origin_extended_image_registry.xml | 4 ++-- 77 files changed, 158 insertions(+), 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 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 eaa1990263..287f3046cc 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 a1a06b8df4..cd8b3d452a 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 72a5793a28..05ab4ab133 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 fcb7fe11a9..d0a7bd0ac0 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 812d586946..481f366285 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 f7344f658f..e6536f80d0 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 884840fb90..23e0874453 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 d14f176956..983178b642 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 015e0cb9f6..e1adac569d 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 06bfc29b40..3b2d75e3e7 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 5bc074ab47..4999da73b5 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 1b8f2d42a9..1a952f87f4 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 da5fe2d393..e778458498 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 3d25104b3b..ec4a5633f9 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 433a845495..64bfe80d30 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 85fd404d39..26b5355087 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 6d2086acfa..1a16d000ab 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 e9d5d80836..a0774fbbda 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 fdea6d832f..56c0aeed69 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 1e34376ef5..4d053fca4e 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 8fb18d749a..f24818892b 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 8a9a2d21e5..af2caea5db 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 c5b2b3d6db..354a52f7a9 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 eaa1990263..287f3046cc 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 a1a06b8df4..cd8b3d452a 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 72a5793a28..05ab4ab133 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 fcb7fe11a9..d0a7bd0ac0 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 812d586946..481f366285 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 a31e4362d8..2af6ff2d07 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 0c4c6759ea..3cc0e1df86 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 7df6b135bd..120c8048a8 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 00bbb7afd5..831cacacfb 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 50484af4b1..9e4f63ae4f 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 217032e5d0..dc0d82cc43 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 a630cf54cf..fd0581e0bd 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 f78b9e74fc..a1848f7ccf 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 86bd5a5222..3e63aa648b 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 b164d4106c..5876599c4b 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 e8b0b427ab..2560f95fb0 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 4dad890b2f..2756185f3b 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 13c2405612..0510a10983 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 8fb18d749a..f24818892b 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 77e2c5707e..4c95538911 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 f7344f658f..e6536f80d0 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 d6a0b817c2..8523769930 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 0181c5ed70..7ac5fe9287 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 24b8a532d0..d45ef4fb47 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 7f929ae294..0a7ad48f86 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 a781e1fe8e..4df7cb8c59 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 aa13765bd1..111320e404 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 9df383d3b8..7466ade674 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 d14f176956..983178b642 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 79872c9796..b59a599762 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 0f6ae3f75c..28445ca916 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 4d31cdd6eb..0ca855cf28 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 f2ee679abc..82d522bac9 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 06bfc29b40..3b2d75e3e7 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 5bc074ab47..4999da73b5 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 eb74fdaeef..2ea08c5dc9 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 da9d9176d8..fcbe9f883a 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 5300ff229d..b8f1414c85 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 c1e7261232..31c3ff418e 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 fdea6d832f..56c0aeed69 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 e25ccc2a9d..21032e3aac 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 1f91597747..ae4dd1696e 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}"