From 94419753c403042c33fa8328247058faad03ffd1 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 8 Apr 2016 10:42:39 -0400 Subject: [PATCH] Migrate packstack to centos-7 dib This is part of our effort to migrate from devstack-centos7 to centos-7 dibs. Change-Id: I4a3b6379823e4b102af1c22814edf1fd50787cc3 Signed-off-by: Paul Belanger --- jenkins/jobs/packstack.yaml | 7 ++++--- jenkins/jobs/projects.yaml | 4 ++-- zuul/layout.yaml | 14 +++++++------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/jenkins/jobs/packstack.yaml b/jenkins/jobs/packstack.yaml index 96d226fea1..0b60283945 100644 --- a/jenkins/jobs/packstack.yaml +++ b/jenkins/jobs/packstack.yaml @@ -1,13 +1,14 @@ - job-template: - name: 'gate-packstack-integration-{scenario}-tempest-dsvm-{ostype}' - node: 'devstack-{ostype}' + name: 'gate-packstack-integration-{scenario}-tempest-{ostype}' + node: '{ostype}' builders: - print-template-name: template-name: "{template-name}" - link-logs - - puppet-prepare-node - gerrit-git-prep + - install-distro-packages + - puppet-prepare-node - shell: | #!/bin/bash -xe export SCENARIO={scenario} diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 549dc5917c..5af9265681 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -5060,7 +5060,7 @@ - project: name: packstack tarball-site: tarballs.openstack.org - ostype: centos7 + ostype: centos-7 scenario: - scenario001 - scenario002 @@ -5068,7 +5068,7 @@ jobs: - python-jobs - 'gate-{name}-releasenotes' - - 'gate-packstack-integration-{scenario}-tempest-dsvm-{ostype}' + - 'gate-packstack-integration-{scenario}-tempest-{ostype}' - project: name: pandaman diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 2d35784c86..2122c39881 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -642,13 +642,13 @@ project-templates: - name: packstack-integration-jobs check: - - gate-packstack-integration-scenario001-tempest-dsvm-centos7 - - gate-packstack-integration-scenario002-tempest-dsvm-centos7 - - gate-packstack-integration-scenario003-tempest-dsvm-centos7 + - gate-packstack-integration-scenario001-tempest-centos-7 + - gate-packstack-integration-scenario002-tempest-centos-7 + - gate-packstack-integration-scenario003-tempest-centos-7 gate: - - gate-packstack-integration-scenario001-tempest-dsvm-centos7 - - gate-packstack-integration-scenario002-tempest-dsvm-centos7 - - gate-packstack-integration-scenario003-tempest-dsvm-centos7 + - gate-packstack-integration-scenario001-tempest-centos-7 + - gate-packstack-integration-scenario002-tempest-centos-7 + - gate-packstack-integration-scenario003-tempest-centos-7 - name: puppet-beaker-jobs check: @@ -1180,7 +1180,7 @@ jobs: # Packstack integration jobs should only run on master and stable/mitaka # onwards - - name: ^gate-packstack-integration-.*-tempest-dsvm-centos7$ + - name: ^gate-packstack-integration-.*-tempest-centos-7$ skip-if: - project: openstack/packstack all-files-match-any: