From c065512020b38a60193ad5123d3f89d2020ff7da Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 4 May 2018 07:28:11 -0700 Subject: [PATCH] (cleanup) move scenario000 tp zuul.d/multinode-jobs.yaml It should not be in base.yaml. Change-Id: I09fc39295f8869b86388e177ff44d47ff4ffed79 --- zuul.d/base.yaml | 36 ------------------------------------ zuul.d/multinode-jobs.yaml | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 369264923..e249d30de 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -40,39 +40,3 @@ roles: - zuul: openstack-infra/zuul-jobs pre-run: playbooks/multinode-networking/pre.yaml - -- job: - name: tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates - description: | - Basic tripleo update job, this is not an upgrade job. - parent: tripleo-ci-dsvm-multinode - pre-run: playbooks/nodepool-provider/pre.yaml - run: playbooks/tripleo-ci/run.yaml - post-run: playbooks/tripleo-ci/post.yaml - timeout: 10800 - voting: true - nodeset: legacy-centos-7-2-node - branches: ^(?!stable/(newton|ocata|pike|queens)).*$ - vars: - toci_jobtype: multinode-1ctlr-featureset037 - # Note (dmsimard): This enforces a minimum TTL for DNS records, see - # https://review.openstack.org/#/c/523178/ for context - unbound_cache_min_ttl: 900 - required-projects: - - openstack-infra/tripleo-ci - - openstack/tripleo-quickstart - - openstack/tripleo-quickstart-extras - - openstack/tripleo-upgrade - irrelevant-files: - - ^.*\.md$ - - ^.*\.rst$ - - ^doc/.*$ - - ^etc/.*$ - - ^metadata.json$ - - ^releasenotes/.*$ - - ^requirements.txt$ - - ^test-requirements.txt$ - - ^spec/.*$ - - ^Puppetfile.*$ - - tox.ini - - ^setup.*$ diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml index ed68c2c4f..49686a421 100644 --- a/zuul.d/multinode-jobs.yaml +++ b/zuul.d/multinode-jobs.yaml @@ -289,3 +289,39 @@ branches: ^(?!stable/(newton|ocata|pike)).*$ vars: toci_jobtype: multinode-1ctlr-featureset038 + +- job: + name: tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates + description: | + Basic tripleo update job, this is not an upgrade job. + parent: tripleo-ci-dsvm-multinode + pre-run: playbooks/nodepool-provider/pre.yaml + run: playbooks/tripleo-ci/run.yaml + post-run: playbooks/tripleo-ci/post.yaml + timeout: 10800 + voting: true + nodeset: legacy-centos-7-2-node + branches: ^(?!stable/(newton|ocata|pike|queens)).*$ + vars: + toci_jobtype: multinode-1ctlr-featureset037 + # Note (dmsimard): This enforces a minimum TTL for DNS records, see + # https://review.openstack.org/#/c/523178/ for context + unbound_cache_min_ttl: 900 + required-projects: + - openstack-infra/tripleo-ci + - openstack/tripleo-quickstart + - openstack/tripleo-quickstart-extras + - openstack/tripleo-upgrade + irrelevant-files: + - ^.*\.md$ + - ^.*\.rst$ + - ^doc/.*$ + - ^etc/.*$ + - ^metadata.json$ + - ^releasenotes/.*$ + - ^requirements.txt$ + - ^test-requirements.txt$ + - ^spec/.*$ + - ^Puppetfile.*$ + - tox.ini + - ^setup.*$