Merge "Migrate kolla jobs to centos-7 dib"

jenkins/jobs/kolla.yaml

@@ -7,28 +7,6 @@
           timeout: 60
       - timestamps
 
-    builders:
-      - link-logs
-      - net-info
-      - gerrit-git-prep
-      - shell: |
-          #!/bin/bash -xe
-          tools/setup_gate.sh
-          tox -e {action}-{distro}-{type}
-
-    publishers:
-      - console-log
-      - devstack-logs
-
-- job-template:
-    name: '{pipeline}-kolla-bindep-{action}-{distro}-{type}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 90
-      - timestamps
-
     builders:
       - link-logs
       - net-info

jenkins/jobs/projects.yaml

@@ -2812,37 +2812,25 @@
       - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
           action: build
           distro: centos
-          node: 'devstack-centos7'
-          pipeline: gate
-          type: binary
-      - '{pipeline}-kolla-bindep-{action}-{distro}-{type}':
-          action: build
-          distro: centos-7
           node: 'centos-7'
           pipeline: gate
           type: binary
       - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
           action: deploy
           distro: centos
-          node: 'devstack-centos7'
+          node: 'centos-7'
           pipeline: gate
           type: binary
       - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
           action: build
           distro: centos
-          node: 'devstack-centos7'
-          pipeline: gate
-          type: source
-      - '{pipeline}-kolla-bindep-{action}-{distro}-{type}':
-          action: build
-          distro: centos-7
           node: 'centos-7'
           pipeline: gate
           type: source
       - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
           action: deploy
           distro: centos
-          node: 'devstack-centos7'
+          node: 'centos-7'
           pipeline: gate
           type: source
       - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
@@ -2872,25 +2860,25 @@
       - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
           action: build
           distro: oraclelinux
-          node: 'devstack-centos7'
+          node: 'centos-7'
           pipeline: gate
           type: binary
       - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
           action: deploy
           distro: oraclelinux
-          node: 'devstack-centos7'
+          node: 'centos-7'
           pipeline: gate
           type: binary
       - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
           action: build
           distro: oraclelinux
-          node: 'devstack-centos7'
+          node: 'centos-7'
           pipeline: gate
           type: source
       - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
           action: deploy
           distro: oraclelinux
-          node: 'devstack-centos7'
+          node: 'centos-7'
           pipeline: gate
           type: source
       - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':

zuul/layout.yaml

@@ -6942,8 +6942,6 @@ projects:
       - gate-kolla-dsvm-deploy-ubuntu-binary
       - gate-kolla-dsvm-deploy-ubuntu-source
     experimental:
-      - gate-kolla-bindep-build-centos-7-binary
-      - gate-kolla-bindep-build-centos-7-source
       - gate-kolla-dsvm-deploy-multinode-ubuntu-source
       - gate-kolla-dsvm-build-oraclelinux-binary
       - gate-kolla-dsvm-deploy-oraclelinux-binary