X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fkubernetes-jobs%2Fkubernetes-release-deploy-test.yaml;h=b7d2fef531aa3df756ef9d29f54d5f3bf371b5cc;hb=refs%2Fchanges%2F72%2F11872%2F1;hp=4ef9f6f8fbc886fea8e46c699d37105b0961e5cf;hpb=3bae112f304e7d84fdcc1c6fc09e5eed58f15e14;p=infra%2Fcicd.git 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 4ef9f6f8..b7d2fef5 100644 --- 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,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' @@ -57,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}' @@ -159,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}'