From e46d98bf0565f32ce9849a9461c2a18fecc4019f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Mon, 15 Oct 2018 13:23:43 +0200
Subject: [PATCH] Prepare migration of base jobs to OSH-infra

Without this patch, openstack-helm-functional and
openstack-helm-multinode are a repetition of the
openstack-helm-infra-functional and openstack-helm-infra-multinode
jobs.

This is a problem, as multiple patches are required to change a base
job, and can lead to inconsistencies.

Instead the abstract jobs should be defined in only one place, the
openstack-helm-infra repositories. This will therefore be the location
of the openstack-helm project lint, functional, and multinode "base"
jobs.

From that point, openstack-helm-infra and openstack-helm can implement
their own job variants should this be required.

This patch fixes the link dependency between the two repositories by
ensuring all the OSH jobs are using their own local job definition
("-temp" jobs) during the migration.

Change-Id: I3d3193415ba65d58c5dd9bbb1fc515f5399edece
Depends-On: https://review.openstack.org/610482
Depends-On: https://review.openstack.org/610488
Depends-On: https://review.openstack.org/611239
---
 zuul.d/jobs-openstack-helm.yaml | 28 ++++++++++++++--------------
 zuul.d/project.yaml             |  8 ++++----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index 48c27fa919..27950cda86 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -18,7 +18,7 @@
 # These will move with their playbooks inside the
 # openstack-helm-infra repository
 - job:
-    name: openstack-helm-functional
+    name: openstack-helm-functional-temp
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
@@ -26,7 +26,7 @@
 
 - job:
     name: openstack-helm-dev-deploy
-    parent: openstack-helm-functional
+    parent: openstack-helm-functional-temp
     roles:
       - zuul: openstack/openstack-helm-infra
     timeout: 7200
@@ -91,8 +91,8 @@
     run: tools/gate/playbooks/dev-deploy-nfs.yaml
 
 - job:
-    name: openstack-helm-multinode
-    parent: openstack-helm-functional
+    name: openstack-helm-multinode-temp
+    parent: openstack-helm-functional-temp
     roles:
       - zuul: openstack/openstack-helm-infra
     vars:
@@ -112,7 +112,7 @@
 - job:
     timeout: 9600
     name: openstack-helm-armada-fullstack-deploy
-    parent: openstack-helm-functional
+    parent: openstack-helm-functional-temp
     roles:
       - zuul: openstack/openstack-helm-infra
     vars:
@@ -132,23 +132,23 @@
     nodeset: openstack-helm-five-node-ubuntu
 
 - job:
-    name: openstack-helm-multinode-ubuntu
-    parent: openstack-helm-multinode
+    name: openstack-helm-multinode-temp-ubuntu
+    parent: openstack-helm-multinode-temp
     nodeset: openstack-helm-five-node-ubuntu
 
 - job:
-    name: openstack-helm-multinode-centos
-    parent: openstack-helm-multinode
+    name: openstack-helm-multinode-temp-centos
+    parent: openstack-helm-multinode-temp
     nodeset: openstack-helm-five-node-centos
 
 - job:
-    name: openstack-helm-multinode-fedora
-    parent: openstack-helm-multinode
+    name: openstack-helm-multinode-temp-fedora
+    parent: openstack-helm-multinode-temp
     nodeset: openstack-helm-five-node-fedora
 
 - job:
     name: openstack-helm-ironic-ubuntu
-    parent: openstack-helm-multinode
+    parent: openstack-helm-multinode-temp
     nodeset: openstack-helm-ubuntu
     run: tools/gate/playbooks/ironic-deploy.yaml
 
@@ -193,7 +193,7 @@
 
 - job:
     timeout: 10800
-    name: openstack-helm-multinode-tempest
-    parent: openstack-helm-multinode
+    name: openstack-helm-multinode-temp-tempest
+    parent: openstack-helm-multinode-temp
     nodeset: openstack-helm-five-node-ubuntu
     run: tools/gate/playbooks/multinode-tempest-deploy.yaml
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index a713ae0e01..b11806927f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -34,7 +34,7 @@
             voting: false
         - openstack-helm-dev-deploy-nfs-ldap:
             voting: false
-        - openstack-helm-multinode-ubuntu:
+        - openstack-helm-multinode-temp-ubuntu:
             voting: false
         - openstack-helm-ironic-ubuntu:
             voting: false
@@ -59,7 +59,7 @@
         - openstack-helm-kolla-deploy-ceph-ovs
     experimental:
       jobs:
-        - openstack-helm-multinode-centos
+        - openstack-helm-multinode-temp-centos
         # NOTE(lamt): Make fedora job experimental until issues with gates are resolved.
-        - openstack-helm-multinode-fedora
-        - openstack-helm-multinode-tempest
+        - openstack-helm-multinode-temp-fedora
+        - openstack-helm-multinode-temp-tempest