diff --git a/configure_facts.sh b/configure_facts.sh index 7f3252935..758c8bb7c 100644 --- a/configure_facts.sh +++ b/configure_facts.sh @@ -20,6 +20,9 @@ OS_NAME_VERS=${REDHAT_SUPPORT_PRODUCT}${REDHAT_SUPPORT_PRODUCT_VERSION} export WRITE_FACTS=${WRITE_FACTS:-true} export DLRN_BASE=${DLRN_BASE:-${OS_NAME_VERS}-master/puppet-passed-ci} export DLRN_DEPS_BASE=${DLRN_DEPS_BASE:-${OS_NAME_VERS}-master/deps/latest/} +# change consistent to puppet-passed-ci after promotion pipeline is setup +export DLRN_BASE_URL=${DLRN_BASE_URL:-${OS_NAME_VERS}-master/consistent/delorean.repo} +export DLRN_DEPS_URL=${DLRN_DEPS_URL:-${OS_NAME_VERS}-master/delorean-deps.repo} export CEPH_VERSION=${CEPH_VERSION:-nautilus} export SCRIPT_DIR=$(cd `dirname $0` && pwd -P) diff --git a/run_tests.sh b/run_tests.sh index b268cf8dc..a165f5d0e 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -202,8 +202,16 @@ fi set +e if [ "${MANAGE_REPOS}" = true ]; then print_header 'Install repos' - $SUDO $PUPPET_FULL_PATH apply $PUPPET_ARGS -e "include openstack_integration::repos" - RESULT=$? + if [[ "${REDHAT_SUPPORT_PRODUCT,,}" = "centos" && ${REDHAT_SUPPORT_PRODUCT_VERSION} = "8" ]]; then + $SUDO curl -o /etc/yum.repos.d/delorean.repo ${NODEPOOL_RDO_PROXY}/${DLRN_BASE_URL} + $SUDO sed -i "s|https://trunk.rdoproject.org|${NODEPOOL_RDO_PROXY}|" /etc/yum.repos.d/delorean.repo + $SUDO curl -o /etc/yum.repos.d/delorean-deps.repo ${NODEPOOL_RDO_PROXY}/${DLRN_DEPS_URL} + $SUDO sed -i "s|https://trunk.rdoproject.org|${NODEPOOL_RDO_PROXY}|" /etc/yum.repos.d/delorean-deps.repo + RESULT=$? + else + $SUDO $PUPPET_FULL_PATH apply $PUPPET_ARGS -e "include openstack_integration::repos" + RESULT=$? + fi if [ $RESULT -ne 0 ] && [ $RESULT -ne 2 ]; then print_header 'Puppet failed to install repositories.' exit 1 diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 7d1e35574..e7c92fc40 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -62,6 +62,14 @@ - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic - puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic - puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic + - puppet-openstack-integration-5-scenario001-tempest-centos-8: + voting: false + - puppet-openstack-integration-5-scenario002-tempest-centos-8: + voting: false + - puppet-openstack-integration-5-scenario003-tempest-centos-8: + voting: false + - puppet-openstack-integration-5-scenario004-tempest-centos-8: + voting: false gate: jobs: - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous @@ -101,6 +109,8 @@ jobs: - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic - puppet-openstack-integration-5-scenario001-tempest-centos-7-luminous + - puppet-openstack-integration-5-scenario001-tempest-centos-8: + voting: false gate: jobs: - puppet-openstack-integration-5-scenario001-tempest-ubuntu-bionic-mimic @@ -120,6 +130,8 @@ jobs: - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic - puppet-openstack-integration-5-scenario002-tempest-centos-7 + - puppet-openstack-integration-5-scenario002-tempest-centos-8: + voting: false gate: jobs: - puppet-openstack-integration-5-scenario002-tempest-ubuntu-bionic @@ -139,6 +151,8 @@ jobs: - puppet-openstack-integration-5-scenario003-tempest-ubuntu-bionic - puppet-openstack-integration-5-scenario003-tempest-centos-7 + - puppet-openstack-integration-5-scenario003-tempest-centos-8: + voting: false gate: jobs: - puppet-openstack-integration-5-scenario003-tempest-centos-7 @@ -157,6 +171,8 @@ jobs: - puppet-openstack-integration-5-scenario004-tempest-ubuntu-bionic-mimic - puppet-openstack-integration-5-scenario004-tempest-centos-7-nautilus + - puppet-openstack-integration-5-scenario004-tempest-centos-8: + voting: false gate: jobs: - puppet-openstack-integration-5-scenario004-tempest-centos-7-nautilus