Promote gate to master

A fix was merged in Tempest so we need to update run_tests.sh to stop
pinning Tempest. Because of that we need to promote the repo otherwise
the downstream CI job will never update the packages.

After this patch got merged, we'll come back on the static URL.

- Unpin Tempest on CentOS
- Pin Tempest on Ubuntu (Ocata not packaged yet)

Change-Id: I2330faf700230fe40119169347ad72f8332d0821
This commit is contained in:
Emilien Macchi 2016-10-26 09:11:40 +02:00
parent a6c16896b8
commit 5faf60ac39
2 changed files with 8 additions and 6 deletions

View File

@ -21,13 +21,13 @@ class openstack_integration::repos {
manage_rdo => false,
manage_epel => false,
repo_hash => {
'ocata-puppet-passed-ci' => {
'baseurl' => 'https://trunk.rdoproject.org/centos7-master/puppet-passed-ci/',
'descr' => 'Ocata puppet-passed-ci',
'ocata-master' => {
'baseurl' => 'https://trunk.rdoproject.org/centos7-master/70/8b/708bda51523ac74af7c7d84604af2e0d4444dddb_accb21d7/',
'descr' => 'Ocata master',
'gpgcheck' => 'no',
'priority' => 1,
},
'ocata-delorean-deps' => {
'ocata-delorean-deps' => {
'baseurl' => 'http://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-ocata',
'descr' => 'Ocata delorean-deps',
'gpgcheck' => 'no',

View File

@ -221,8 +221,10 @@ echo "TestEncryptedCinderVolumes" >> /tmp/openstack/tempest/test-whitelist.txt
print_header 'Running Tempest'
cd /tmp/openstack/tempest
# Until https://review.openstack.org/#/c/389848/ is merged
git checkout 2866e9fdacbeac5fe98f9e1af78b239de753ce4e
# Until https://review.openstack.org/#/c/389848/ is packaged in UCA/Ocata
if uses_debs; then
git checkout 2866e9fdacbeac5fe98f9e1af78b239de753ce4e
fi
virtualenv --system-site-packages run_tempest
run_tempest/bin/pip install -U .