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 5376bb06fd453e14399b6c1069467f995e965142..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
@@ -38,10 +38,10 @@
       - offline:
           disabled: false
           execution-mode: offline-deployment
-          successful: true
-          failed: true
-          unstable: true
-          notbuilt: true
+          successful: false
+          failed: false
+          unstable: false
+          notbuilt: false
 
     distro:
       - ubuntu1804
@@ -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}'
@@ -104,12 +116,6 @@
 
     properties:
       - logrotate
-#      - build-blocker:
-#          use-build-blocker: true
-#          blocking-jobs:
-#            - 'engine-verify-online-ubuntu1804.*'
-#            - 'engine-verify-offline-ubuntu1804.*'
-#          block-level: 'NODE'
       - throttle:
           max-per-node: 1
           max-total: 3
@@ -173,7 +179,6 @@
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
-#             enable-condition: "\"$EXECUTION_MODE\" == \"offline-deployment\""
       - multijob:
           name: "{environment-type} deployment and testing"
           condition: SUCCESSFUL
@@ -197,9 +202,12 @@
                 EXECUTION_MODE=$EXECUTION_MODE
                 VERBOSITY=$VERBOSITY
                 DISTRO=$DISTRO
-              property-file: "$WORKSPACE/change.properties"
+                INSTALLER_TYPE=$INSTALLER_TYPE
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                PDF=$PDF
+                IDF=$IDF
               kill-phase-on: FAILURE
-              abort-all-job: true
+              abort-all-job: false
             - name: 'engine-verify-{environment-type}-deploy-test-{distro}-city-cloud-master'
               current-parameters: false
               node-parameters: false
@@ -218,8 +226,12 @@
                 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: true
+              abort-all-job: false
 
 - job-template:
     name: 'engine-verify-packaging-{distro}-{stream}'