From 732515b512beee02a6b6b4b0c8daec599f1df63d Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fdegir@gmail.com>
Date: Thu, 19 Mar 2020 14:46:07 +0000
Subject: [PATCH] engine: Move PDF and IDF parameters to deployment jobs

Change-Id: I0044186dc32f26c4ec6fc4c1ab8552ba8a25820a
---
 .../engine-verify-deployment-parent-jobs.yaml    | 16 ++++------------
 .../engine-verify-offline-deploy-test.yaml       | 14 ++++++++++++--
 .../engine-verify-online-deploy-test.yaml        | 14 ++++++++++++--
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/jjb/engine/engine-verify-jobs/engine-verify-deployment-parent-jobs.yaml b/jjb/engine/engine-verify-jobs/engine-verify-deployment-parent-jobs.yaml
index c53575894..ab95a5b05 100644
--- a/jjb/engine/engine-verify-jobs/engine-verify-deployment-parent-jobs.yaml
+++ b/jjb/engine/engine-verify-jobs/engine-verify-deployment-parent-jobs.yaml
@@ -31,8 +31,6 @@
       - online:
           disabled: false
           execution-mode: online-deployment
-          pdf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-pdf.yml'
-          idf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-idf.yml'
           successful: false
           failed: false
           unstable: false
@@ -40,8 +38,6 @@
       - offline:
           disabled: false
           execution-mode: offline-deployment
-          pdf: 'file:///opt/engine/offline/git/hwconfig/pods/nordix-vpod1-pdf.yml'
-          idf: 'file:///opt/engine/offline/git/hwconfig/pods/nordix-vpod1-idf.yml'
           successful: false
           failed: false
           unstable: false
@@ -84,14 +80,6 @@
           name: DEPLOY_SCENARIO
           default: 'k8-calico-nofeature'
           description: 'Scenario to deploy and test'
-      - string:
-          name: PDF
-          default: '{pdf}'
-          description: 'PDF file to use for deployment'
-      - string:
-          name: IDF
-          default: '{idf}'
-          description: 'IDF file to use for deployment'
       - string:
           name: VERBOSITY
           default: 'true'
@@ -112,6 +100,10 @@
           name: NORDIX_ARTIFACT_URL
           default: "$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/installer/oss/change/$GERRIT_CHANGE_NUMBER/k8s-installer-ubuntu1804.bsx"
           description: 'Name of the repository to upload and download artifact to/from. Depends on the stack'
+      - string:
+          name: CI_LOOP
+          default: 'verify'
+          description: 'CI loop type'
       - label:
           name: SLAVE_LABEL
           default: 'engine-master-{environment-type}-{distro}'
diff --git a/jjb/engine/engine-verify-jobs/engine-verify-offline-deploy-test.yaml b/jjb/engine/engine-verify-jobs/engine-verify-offline-deploy-test.yaml
index 2c020afc4..e16398a69 100644
--- a/jjb/engine/engine-verify-jobs/engine-verify-offline-deploy-test.yaml
+++ b/jjb/engine/engine-verify-jobs/engine-verify-offline-deploy-test.yaml
@@ -25,6 +25,8 @@
     stream:
       - 'master':
           branch: '{stream}'
+          pdf: 'file:///opt/engine/offline/git/hwconfig/pods/nordix-vpod1-pdf.yml'
+          idf: 'file:///opt/engine/offline/git/hwconfig/pods/nordix-vpod1-idf.yml'
 
     phase:
       - deploy
@@ -71,6 +73,14 @@
           name: PROVISIONER_TYPE
           default: '{provisioner-type}'
           description: 'Provisioner type to use'
+      - string:
+          name: PDF
+          default: '{pdf}'
+          description: 'PDF file to use for deployment'
+      - string:
+          name: IDF
+          default: '{idf}'
+          description: 'IDF file to use for deployment'
       - string:
           name: HEAT_ENVIRONMENT_FILENAME
           default: 'heat-environment-{cloud}-{distro}.yaml'
@@ -135,7 +145,7 @@
       - 'engine-generate-ssh-keypair-macro'
       - 'engine-download-artifact-macro'
       - multijob:
-          name: "Offline Deployment on {type} instances"
+          name: "offline deployment on {type} instances"
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
@@ -145,7 +155,7 @@
               kill-phase-on: FAILURE
               abort-all-job: false
       - multijob:
-          name: "Offline Testing on {type} instances"
+          name: "offline testing on {type} instances"
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
diff --git a/jjb/engine/engine-verify-jobs/engine-verify-online-deploy-test.yaml b/jjb/engine/engine-verify-jobs/engine-verify-online-deploy-test.yaml
index 26bfe5d4f..3118e34da 100644
--- a/jjb/engine/engine-verify-jobs/engine-verify-online-deploy-test.yaml
+++ b/jjb/engine/engine-verify-jobs/engine-verify-online-deploy-test.yaml
@@ -25,6 +25,8 @@
     stream:
       - 'master':
           branch: '{stream}'
+          pdf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-pdf.yml'
+          idf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-idf.yml'
 
     phase:
       - deploy
@@ -71,6 +73,14 @@
           name: PROVISIONER_TYPE
           default: '{provisioner-type}'
           description: 'Provisioner type to use'
+      - string:
+          name: PDF
+          default: '{pdf}'
+          description: 'PDF file to use for deployment'
+      - string:
+          name: IDF
+          default: '{idf}'
+          description: 'IDF file to use for deployment'
       - string:
           name: HEAT_ENVIRONMENT_FILENAME
           default: 'heat-environment-{cloud}-{distro}.yaml'
@@ -140,7 +150,7 @@
       - 'engine-generate-ssh-keypair-macro'
       - 'engine-download-artifact-macro'
       - multijob:
-          name: "Online Deployment on {type} instances"
+          name: "online deployment on {type} instances"
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
@@ -150,7 +160,7 @@
               kill-phase-on: FAILURE
               abort-all-job: false
       - multijob:
-          name: "Online Testing on {type} instances"
+          name: "online testing on {type} instances"
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-- 
2.25.1