From 9ff8c256c87b101fdd787e18f3db41f98ab2fa03 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fdegir@gmail.com>
Date: Fri, 1 Mar 2019 15:45:57 +0100
Subject: [PATCH] Parameterize DIB OS variables and move to Ubuntu1804

Due to the issues with Ubuntu1604, the job is disabled until
further work is done and instead Ubuntu1804 job is enabled.

Apart from that, the variables used by DIB is parameterized
within job so we can run diffent distro jobs.

Change-Id: I1ad85e7c64873ac187081e8daae7cc0c61be9298
---
 jjb/cloud-infra/cloud-infra-verify-jobs.yaml | 65 ++++++++++++++++----
 1 file changed, 54 insertions(+), 11 deletions(-)

diff --git a/jjb/cloud-infra/cloud-infra-verify-jobs.yaml b/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
index 65c6ea0a7..41dc3c406 100644
--- a/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-jobs.yaml
@@ -30,14 +30,23 @@
 
     os:
       - ubuntu1604:
-          distribution: ubuntu16
-          disabled: 'false'
-      - ubuntu1804:
-          distribution: ubuntu18
           disabled: 'true'
+          distribution: 'ubuntu16'
+          ipa_dib_os_element: 'fedora'
+          dib_os_release: 'xenial'
+          dib_os_element: 'ubuntu-minimal'
+      - ubuntu1804:
+          disabled: 'false'
+          distribution: 'ubuntu18'
+          ipa_dib_os_element: 'fedora'
+          dib_os_release: 'bionic'
+          dib_os_element: 'ubuntu-minimal'
       - centos7:
-          distribution: centos7
           disabled: 'true'
+          distribution: 'centos7'
+          ipa_dib_os_element: 'fedora'
+          dib_os_release: '7'
+          dib_os_element: 'centos-minimal'
 
     type:
       - virtual
@@ -67,12 +76,27 @@
       - label:
           name: SLAVE_LABEL
           default: 'vpod-deploy-{os}'
+          description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
+      - string:
+          name: DISTRIBUTION
+          default: '{distribution}'
+          description: 'Distribution to use for configuring target nodes (networking etc.)'
       - string:
-          name: DISTRO
-          default: '{os}'
+          name: IPA_DIB_OS_ELEMENT
+          default: '{ipa_dib_os_element}'
+          description: 'DIB OS Element to use for building the ramdisk image'
+      - string:
+          name: DIB_OS_RELEASE
+          default: '{dib_os_release}'
+          description: 'DIB OS Release to use for building the deployment image to provision target nodes with'
+      - string:
+          name: DIB_OS_ELEMENT
+          default: '{dib_os_element}'
+          description: 'DIB OS Element to use for building the deployment image to provision target nodes with'
       - string:
           name: CLEANUP
           default: 'true'
+          description: 'Cleanup leftovers of the previous run'
 
     properties:
       - logrotate
@@ -115,7 +139,10 @@
             - name: 'cloud-infra-verify-{os}-deploy-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION={distribution}
+                DISTRIBUTION=$DISTRIBUTION
+                IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
+                DIB_OS_RELEASE=$DIB_OS_RELEASE
+                DIB_OS_ELEMENT=$DIB_OS_ELEMENT
                 CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -132,7 +159,10 @@
             - name: 'cloud-infra-verify-{os}-test-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION={distribution}
+                DISTRIBUTION=$DISTRIBUTION
+                IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
+                DIB_OS_RELEASE=$DIB_OS_RELEASE
+                DIB_OS_ELEMENT=$DIB_OS_ELEMENT
                 CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -158,8 +188,21 @@
           name: PROJECT
           default: $GERRIT_PROJECT
       - string:
-          name: DISTRO
-          default: 'ubuntu1604'
+          name: DISTRIBUTION
+          default: 'ubuntu18'
+          description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
+      - string:
+          name: IPA_DIB_OS_ELEMENT
+          default: 'fedora'
+          description: 'DIB OS Element to use for building the ramdisk image. Overriden by upstream job.'
+      - string:
+          name: DIB_OS_RELEASE
+          default: 'bionic'
+          description: 'DIB OS Release to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
+      - string:
+          name: DIB_OS_ELEMENT
+          default: 'ubuntu-minimal'
+          description: 'DIB OS Element to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
       - string:
           name: CLEANUP
           default: 'false'
-- 
2.25.1