Remove yardstick test phase from k8s release job

[infra/cicd.git] / jjb / cloud-infra / kubernetes-jobs / kubernetes-release-deploy-test.yaml

diff --git a/jjb/cloud-infra/kubernetes-jobs/kubernetes-release-deploy-test.yaml b/jjb/cloud-infra/kubernetes-jobs/kubernetes-release-deploy-test.yaml
index 3a15f49ac005d660255c6f3e27402a8b6689d92c..b7d2fef531aa3df756ef9d29f54d5f3bf371b5cc 100644 (file)
--- a/jjb/cloud-infra/kubernetes-jobs/kubernetes-release-deploy-test.yaml
+++ b/jjb/cloud-infra/kubernetes-jobs/kubernetes-release-deploy-test.yaml
@@ -26,6 +26,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'
@@ -54,9 +63,6 @@
       - functest:
           build-timeout: 210
           execution-mode: online-test
-      - yardstick:
-          build-timeout: 30
-          execution-mode: online-test
 
     jobs:
       - 'kubernetes-release-{environment-type}-deploy-test-{distro}-baremetal-{stream}'
@@ -134,7 +140,7 @@
     builders:
       - description-setter:
           description: $DEPLOY_SCENARIO
-      - 'download-artifact-macro'
+      - 'download-deploy-artifact-macro'
       - multijob:
           name: "Offline Deployment on Baremetal using {deploy-scenario}"
           condition: SUCCESSFUL
@@ -156,16 +162,6 @@
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
-      - multijob:
-          name: Platform Benchmarking
-          condition: ALWAYS
-          projects:
-            - name: 'kubernetes-release-{environment-type}-yardstick-{distro}-baremetal-{stream}'
-              current-parameters: true
-              git-revision: false
-              node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
 
 - job-template:
     name: 'kubernetes-release-{environment-type}-{phase}-{distro}-baremetal-{stream}'