From 5bb3261584bf8594be3e9892bf75a4492f20df8c Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 23 Aug 2017 15:19:56 -0600 Subject: [PATCH] Enable opstools-testing repo The opstools repo is currently broken due to a missing dependency. To unblock CI we can find this dependency in the opstools-testing repo. Once the dependency is fixed, we should revert this change. Change-Id: I54ea687ee9165baec1ef1b5c27e40c233683d108 Related-Bug: #1712621 --- config/release/tripleo-ci/consistent-master.yml | 6 ++++++ config/release/tripleo-ci/consistent-newton.yml | 6 ++++++ config/release/tripleo-ci/consistent-ocata.yml | 6 ++++++ config/release/tripleo-ci/consistent-pike.yml | 6 ++++++ .../tripleo-ci/master-undercloud-ocata-overcloud.yml | 6 ++++++ config/release/tripleo-ci/master.yml | 6 ++++++ config/release/tripleo-ci/newton.yml | 6 ++++++ config/release/tripleo-ci/ocata.yml | 6 ++++++ config/release/tripleo-ci/pike.yml | 6 ++++++ 9 files changed, 54 insertions(+) diff --git a/config/release/tripleo-ci/consistent-master.yml b/config/release/tripleo-ci/consistent-master.yml index a53b4605b..2a08c5ee2 100644 --- a/config/release/tripleo-ci/consistent-master.yml +++ b/config/release/tripleo-ci/consistent-master.yml @@ -78,6 +78,12 @@ repos: filename: quickstart-centos-opstools.repo baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/opstools/x86_64/ + # TODO(aschultz): remove me after LP#1712621 is resolved + - type: generic + reponame: quickstart-centos-opstools-testing + filename: quickstart-centos-opstools-testing.repo + baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/opstools/x86_64/ + repo_cmd_after: | {% if not enable_opstools_repo|default(false)|bool %}sudo yum-config-manager --save --setopt centos-opstools.enable=0; {%endif %} diff --git a/config/release/tripleo-ci/consistent-newton.yml b/config/release/tripleo-ci/consistent-newton.yml index fe4c6da48..17e496d7f 100644 --- a/config/release/tripleo-ci/consistent-newton.yml +++ b/config/release/tripleo-ci/consistent-newton.yml @@ -78,6 +78,12 @@ repos: filename: quickstart-centos-opstools.repo baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/opstools/x86_64/ + # TODO(aschultz): remove me after LP#1712621 is resolved + - type: generic + reponame: quickstart-centos-opstools-testing + filename: quickstart-centos-opstools-testing.repo + baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/opstools/x86_64/ + repo_cmd_after: | {% if not enable_opstools_repo|default(false)|bool %}sudo yum-config-manager --save --setopt centos-opstools.enable=0; {%endif %} diff --git a/config/release/tripleo-ci/consistent-ocata.yml b/config/release/tripleo-ci/consistent-ocata.yml index a828bab5d..059d07b9e 100644 --- a/config/release/tripleo-ci/consistent-ocata.yml +++ b/config/release/tripleo-ci/consistent-ocata.yml @@ -78,6 +78,12 @@ repos: filename: quickstart-centos-opstools.repo baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/opstools/x86_64/ + # TODO(aschultz): remove me after LP#1712621 is resolved + - type: generic + reponame: quickstart-centos-opstools-testing + filename: quickstart-centos-opstools-testing.repo + baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/opstools/x86_64/ + repo_cmd_after: | {% if not enable_opstools_repo|default(false)|bool %}sudo yum-config-manager --save --setopt centos-opstools.enable=0; {%endif %} diff --git a/config/release/tripleo-ci/consistent-pike.yml b/config/release/tripleo-ci/consistent-pike.yml index d50202525..74ef9ef74 100644 --- a/config/release/tripleo-ci/consistent-pike.yml +++ b/config/release/tripleo-ci/consistent-pike.yml @@ -78,6 +78,12 @@ repos: filename: quickstart-centos-opstools.repo baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/opstools/x86_64/ + # TODO(aschultz): remove me after LP#1712621 is resolved + - type: generic + reponame: quickstart-centos-opstools-testing + filename: quickstart-centos-opstools-testing.repo + baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/opstools/x86_64/ + repo_cmd_after: | {% if not enable_opstools_repo|default(false)|bool %}sudo yum-config-manager --save --setopt centos-opstools.enable=0; {%endif %} diff --git a/config/release/tripleo-ci/master-undercloud-ocata-overcloud.yml b/config/release/tripleo-ci/master-undercloud-ocata-overcloud.yml index df81be615..f4573baf7 100644 --- a/config/release/tripleo-ci/master-undercloud-ocata-overcloud.yml +++ b/config/release/tripleo-ci/master-undercloud-ocata-overcloud.yml @@ -109,6 +109,12 @@ repos: filename: quickstart-centos-opstools.repo baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/opstools/x86_64/ + # TODO(aschultz): remove me after LP#1712621 is resolved + - type: generic + reponame: quickstart-centos-opstools-testing + filename: quickstart-centos-opstools-testing.repo + baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/opstools/x86_64/ + repo_cmd_after: | {% if not enable_opstools_repo|default(false)|bool %}sudo yum-config-manager --save --setopt centos-opstools.enable=0; {%endif %} diff --git a/config/release/tripleo-ci/master.yml b/config/release/tripleo-ci/master.yml index 09ed97882..25ceab7ab 100644 --- a/config/release/tripleo-ci/master.yml +++ b/config/release/tripleo-ci/master.yml @@ -102,6 +102,12 @@ repos: filename: quickstart-centos-opstools.repo baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/opstools/x86_64/ + # TODO(aschultz): remove me after LP#1712621 is resolved + - type: generic + reponame: quickstart-centos-opstools-testing + filename: quickstart-centos-opstools-testing.repo + baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/opstools/x86_64/ + repo_cmd_after: | {% if not enable_opstools_repo|default(false)|bool %}sudo yum-config-manager --save --setopt centos-opstools.enable=0; {%endif %} diff --git a/config/release/tripleo-ci/newton.yml b/config/release/tripleo-ci/newton.yml index 2e9473b7b..dab74cbce 100644 --- a/config/release/tripleo-ci/newton.yml +++ b/config/release/tripleo-ci/newton.yml @@ -78,6 +78,12 @@ repos: filename: quickstart-centos-opstools.repo baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/opstools/x86_64/ + # TODO(aschultz): remove me after LP#1712621 is resolved + - type: generic + reponame: quickstart-centos-opstools-testing + filename: quickstart-centos-opstools-testing.repo + baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/opstools/x86_64/ + repo_cmd_after: | {% if not enable_opstools_repo|default(false)|bool %}sudo yum-config-manager --save --setopt centos-opstools.enable=0; {%endif %} diff --git a/config/release/tripleo-ci/ocata.yml b/config/release/tripleo-ci/ocata.yml index 8f527f211..084eed430 100644 --- a/config/release/tripleo-ci/ocata.yml +++ b/config/release/tripleo-ci/ocata.yml @@ -78,6 +78,12 @@ repos: filename: quickstart-centos-opstools.repo baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/opstools/x86_64/ + # TODO(aschultz): remove me after LP#1712621 is resolved + - type: generic + reponame: quickstart-centos-opstools-testing + filename: quickstart-centos-opstools-testing.repo + baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/opstools/x86_64/ + repo_cmd_after: | {% if not enable_opstools_repo|default(false)|bool %}sudo yum-config-manager --save --setopt centos-opstools.enable=0; {%endif %} diff --git a/config/release/tripleo-ci/pike.yml b/config/release/tripleo-ci/pike.yml index d141925cd..09abd7121 100644 --- a/config/release/tripleo-ci/pike.yml +++ b/config/release/tripleo-ci/pike.yml @@ -78,6 +78,12 @@ repos: filename: quickstart-centos-opstools.repo baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/opstools/x86_64/ + # TODO(aschultz): remove me after LP#1712621 is resolved + - type: generic + reponame: quickstart-centos-opstools-testing + filename: quickstart-centos-opstools-testing.repo + baseurl: ${NODEPOOL_BUILDLOGS_CENTOS_PROXY}/centos/7/opstools/x86_64/ + repo_cmd_after: | {% if not enable_opstools_repo|default(false)|bool %}sudo yum-config-manager --save --setopt centos-opstools.enable=0; {%endif %}