X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fkubernetes-jobs%2Fkubernetes-verify-deploy-test.yaml;h=223597f02bcfed8a473a88aab0752b0f2a7d09f1;hb=c97da99c7825628dce84c66d3e2fec1eb969b952;hp=cab7e12d2e4eacd7ad8e1b47bb6cdf37d38c5b52;hpb=a41cb97c1eb86df7fd495dff15100b2e7a005a0c;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/kubernetes-jobs/kubernetes-verify-deploy-test.yaml b/jjb/cloud-infra/kubernetes-jobs/kubernetes-verify-deploy-test.yaml
index cab7e12d..223597f0 100644
--- a/jjb/cloud-infra/kubernetes-jobs/kubernetes-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/kubernetes-jobs/kubernetes-verify-deploy-test.yaml
@@ -29,6 +29,15 @@
       - 'master':
           branch: 'master'
           deploy-scenario: 'k8-multus-plugins'
+      - '1_20':
+          branch: '1.20'
+          deploy-scenario: 'k8-multus-plugins'
+      - '1_19':
+          branch: '1.19'
+          deploy-scenario: 'k8-multus-plugins'
+      - '1_18':
+          branch: '1.18'
+          deploy-scenario: 'k8-multus-plugins'
       - '1_17':
           branch: '1.17'
           deploy-scenario: 'k8-multus-plugins'
@@ -70,7 +79,7 @@
           provisioner-type: 'heat'
           slave-type: 'jumphost'
           gated-projects: 'infra/stack/kubernetes|infra/installer/kubespray'
-          pdf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-environment-city-ubuntu1804.yaml"
+          pdf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-environment-ci-city-ubuntu1804.yaml"
           idf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-idf.yaml"
 
     distro:
@@ -125,10 +134,6 @@
           name: IDF
           default: '{idf}'
           description: 'IDF file to use for deployment'
-      - string:
-          name: HEAT_ENVIRONMENT_FILENAME
-          default: 'heat-environment-{cloud}-{distro}.yaml'
-          description: 'Name of heat-environment file to use.'
       - string:
           name: HEAT_STACK_NAME
           default: "nordix-cicd-verify-kubernetes-{environment-type}-{distro}-$GERRIT_CHANGE_NUMBER"
@@ -169,6 +174,10 @@
           name: CI_LOOP
           default: "verify"
           description: 'CI loop the job belongs to'
+      - string:
+          name: ROOK_FS
+          default: 'true'
+          description: 'Whether to deploy csi-cephfs storageclass.'
       - project-parameters:
           project: $GERRIT_PROJECT
           branch: '{branch}'
@@ -268,6 +277,9 @@
                   # we need to get rid of search domain as well
                   sudo sed -i 's/^search/# search/' /etc/resolv.conf
                 fi
+      - ssh-agent-credentials:
+          users:
+            - 'nordixinfra-nordix-gerrit-ssh'
 
     builders:
       - 'generate-change-metadata-macro'
@@ -283,6 +295,8 @@
               kill-phase-on: FAILURE
               abort-all-job: false
               property-file: $WORKSPACE/change.properties
+              enable-condition:
+                !include-raw: '../scripts/k8s-job-enable-condition.gvy'
       - multijob:
           name: "{environment-type} testing on {type} instances"
           condition: SUCCESSFUL
@@ -295,6 +309,8 @@
               kill-phase-on: FAILURE
               abort-all-job: false
               property-file: $WORKSPACE/change.properties
+              enable-condition:
+                !include-raw: '../scripts/k8s-job-enable-condition.gvy'
 
     publishers:
       - postbuildscript:
@@ -349,5 +365,5 @@
     builders:
       - 'generate-ssh-keypair-macro'
       - 'wait-pkg-mgr-macro'
-      - 'download-artifact-macro'
+      - 'download-{phase}-artifact-macro'
       - '{phase}-macro'