engine-verify: Parameterize deployment variables

Change-Id: I61c6aa9bca23eb619280cac7bb6757e4bec9d658

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 eb7f1d4e20a003125132bf6e9b4bcda971d40683..c53575894a7a6aa7b115338d90cc2cf345f18cd2 100644 (file)
--- 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,6 +31,8 @@
       - 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
@@ -38,6 +40,8 @@
       - 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
@@ -72,6 +76,22 @@
           name: DISTRO
           default: '{distro}'
           description: 'Distribution to use for configuring target nodes (networking etc.)'
+      - string:
+          name: INSTALLER_TYPE
+          default: 'kubespray'
+          description: 'Installer type to use'
+      - string:
+          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'
@@ -190,6 +210,10 @@
                 EXECUTION_MODE=$EXECUTION_MODE
                 VERBOSITY=$VERBOSITY
                 DISTRO=$DISTRO
+                INSTALLER_TYPE=$INSTALLER_TYPE
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                PDF=$PDF
+                IDF=$IDF
               kill-phase-on: FAILURE
               abort-all-job: false
             - name: 'engine-verify-{environment-type}-deploy-test-{distro}-city-cloud-master'
@@ -210,6 +234,10 @@
                 EXECUTION_MODE=$EXECUTION_MODE
                 VERBOSITY=$VERBOSITY
                 DISTRO=$DISTRO
+                INSTALLER_TYPE=$INSTALLER_TYPE
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                PDF=$PDF
+                IDF=$IDF
               kill-phase-on: FAILURE
               abort-all-job: false
 

diff --git a/jjb/engine/engine-verify-jobs/scripts/deploy.sh b/jjb/engine/engine-verify-jobs/scripts/deploy.sh
index 4218c5e41277cad427e6cfb63dcdc5b0921e914b..cfaa8c079917fdb6f632267595f1e1fe2dca458c 100755 (executable)
--- a/jjb/engine/engine-verify-jobs/scripts/deploy.sh
+++ b/jjb/engine/engine-verify-jobs/scripts/deploy.sh
@@ -29,16 +29,12 @@ fi
 
 if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then
   ENGINE_ROOT_DIR="/opt/engine/offline/git/engine"
-  PDF="file:///opt/engine/offline/git/hwconfig/pods/nordix-vpod1-pdf.yml"
-  IDF="file:///opt/engine/offline/git/hwconfig/pods/nordix-vpod1-idf.yml"
 else
   ENGINE_ROOT_DIR="$WORKSPACE"
-  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"
 fi
 
 /bin/cp -f $OPENRC_FILE /tmp/openrc
 cd "$ENGINE_ROOT_DIR/engine"
-./deploy.sh -d kubespray -s k8-calico-nofeature -b "file://$ENGINE_ROOT_DIR/engine/inventory/group_vars/all/sdf.yaml" \
-    -r $PROVISIONER_TYPE -p $PDF -i $IDF -u /tmp/openrc \
+./deploy.sh -d "$INSTALLER_TYPE" -s "$DEPLOY_SCENARIO" -b "file://$ENGINE_ROOT_DIR/engine/inventory/group_vars/all/sdf.yaml" \
+    -r "$PROVISIONER_TYPE" -p "$PDF" -i "$IDF" -u /tmp/openrc \
     -e "file://$ENGINE_ROOT_DIR/engine/provisioner/heat/playbooks/roles/bootstrap-hwconfig/files/$HEAT_ENVIRONMENT_FILENAME"