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=82626e274409bcf62e39225cc6a9859d41aaffb8;hpb=1c4c03ef53881f5149521400a7878456dcda5531;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 82626e27..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,12 @@
       - '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'
@@ -168,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}'
@@ -267,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'
@@ -282,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
@@ -294,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:
@@ -348,5 +365,5 @@
     builders:
       - 'generate-ssh-keypair-macro'
       - 'wait-pkg-mgr-macro'
-      - 'download-artifact-macro'
+      - 'download-{phase}-artifact-macro'
       - '{phase}-macro'