engine: Move PDF and IDF parameters to deployment jobs

[infra/cicd.git] / jjb / engine / engine-verify-jobs / engine-verify-deployment-parent-jobs.yaml

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..ab95a5b05cfc7d69fd49e29f1c90561ea42b5f21 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
@@ -72,6 +72,14 @@
           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: VERBOSITY
           default: 'true'
@@ -92,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}'
@@ -190,6 +202,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 +226,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