From 011e8a0bf2cb1f981bb071666fc43f4561270f90 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fdegir@gmail.com>
Date: Wed, 22 Apr 2020 08:58:14 +0000
Subject: [PATCH] engine: Set k8-multus-plugins scenario for k8s release jobs

Change-Id: I7e99c3454444e9fd8d01036da0100b853618b2f4
---
 .../kubernetes-offline-deploy-test-jobs.yaml  |  3 +--
 .../kubernetes-offline-release-jobs.yaml      | 23 +++----------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-deploy-test-jobs.yaml b/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-deploy-test-jobs.yaml
index a0fd07d3b..0911e4279 100644
--- a/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-deploy-test-jobs.yaml
+++ b/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-deploy-test-jobs.yaml
@@ -30,8 +30,7 @@
       - ubuntu1804
 
     deploy-scenario:
-      - k8-calico-nofeature
-      - k8-multus-nofeature
+      - k8-multus-plugins
 
 
     type:
diff --git a/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-release-jobs.yaml b/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-release-jobs.yaml
index 29a3dba22..28081a092 100644
--- a/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-release-jobs.yaml
+++ b/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-release-jobs.yaml
@@ -67,7 +67,7 @@
           description: 'Installer type to use'
       - string:
           name: DEPLOY_SCENARIO
-          default: 'k8-calico-nofeature'
+          default: 'k8-multus-plugins'
           description: 'Scenario to deploy and test'
       - string:
           name: VERBOSITY
@@ -148,28 +148,11 @@
               kill-phase-on: FAILURE
               abort-all-job: true
       - multijob:
-          name: release test k8-calico-nofeature
+          name: release test k8-multus-plugins
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'k8-calico-nofeature-offline-{distro}-baremetal-periodic'
-              current-parameters: false
-              git-revision: false
-              node-parameters: false
-              property-file: "$WORKSPACE/build.properties"
-              predefined-parameters: |
-                EXECUTION_MODE=$EXECUTION_MODE
-                NORDIX_ARM_PUBLIC_IP=$NORDIX_ARM_PUBLIC_IP
-                ARTIFACT_TO_DOWNLOAD=$ARTIFACT_TO_DOWNLOAD
-                VERBOSITY=$VERBOSITY
-              kill-phase-on: FAILURE
-              abort-all-job: true
-      - multijob:
-          name: release test k8-multus-nofeature
-          condition: SUCCESSFUL
-          execution-type: PARALLEL
-          projects:
-            - name: 'k8-multus-nofeature-offline-{distro}-baremetal-periodic'
+            - name: 'k8-multus-multus-plugins-offline-{distro}-baremetal-periodic'
               current-parameters: false
               git-revision: false
               node-parameters: false
-- 
2.25.1