From 929e8b0365627e764ef799d1ab2293f1f11e098a Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@est.tech>
Date: Thu, 2 Jul 2020 20:29:39 +0000
Subject: [PATCH] engine: Set stack version to change revision

Change-Id: Id581ca31c096d761a64f7900cf15cc1a7f68aee4
---
 jjb/engine/scripts/functest.sh                |  2 +-
 .../scripts/generate-change-metadata.sh       | 20 +------------------
 .../verify-jobs/ironic-verify-package.yaml    |  2 +-
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/jjb/engine/scripts/functest.sh b/jjb/engine/scripts/functest.sh
index 6438dda76..dad8a3206 100755
--- a/jjb/engine/scripts/functest.sh
+++ b/jjb/engine/scripts/functest.sh
@@ -46,7 +46,7 @@ git clone -q $TEST_REPO_URL $WORKSPACE
 export EXECUTION_MODE=$(echo "$EXECUTION_MODE" | sed 's/deployment/test/g')
 
 cd $WORKSPACE/test
-./test.sh -s "$STACK_TYPE" -b "$STACK_VERSION" -c "$DEPLOY_SCENARIO" -f "$TEST_FW" -t "$TEST_SUITE" \
+./test.sh -s "$STACK_TYPE" -b "$BRANCH" -c "$DEPLOY_SCENARIO" -f "$TEST_FW" -t "$TEST_SUITE" \
     -o /tmp/openrc -i /tmp/inventory.ini -y "$YARDSTICK_DISPATCHER" -v
 
 # vim: set ts=2 sw=2 expandtab:
diff --git a/jjb/engine/scripts/generate-change-metadata.sh b/jjb/engine/scripts/generate-change-metadata.sh
index 84b71467b..219c186a5 100755
--- a/jjb/engine/scripts/generate-change-metadata.sh
+++ b/jjb/engine/scripts/generate-change-metadata.sh
@@ -33,7 +33,7 @@ if [[ "$GERRIT_PROJECT" != "infra/engine" ]]; then
 fi
 
 # file to record change metadata
- export CHANGE_METADATA_FILE="$WORKSPACE/change.properties"
+export CHANGE_METADATA_FILE="$WORKSPACE/change.properties"
 /bin/rm -f "$CHANGE_METADATA_FILE"
 
 echo "Info  : Generating change metadata"
@@ -49,24 +49,6 @@ if [[ "$GERRIT_PROJECT" =~ /stack/ ]]; then
   export STACK_VERSION="$GERRIT_PATCHSET_REVISION"
   export STACK_REFSPEC="$GERRIT_REFSPEC"
 
-  case "${STACK_TYPE}" in
-    openstack)
-      echo "Info  : Deploy scenario is overriden by job to $DEPLOY_SCENARIO"
-      ;;
-    kubernetes)
-      echo "Info  : Deploy scenario is overriden by job to $DEPLOY_SCENARIO"
-      ;;
-    onap)
-      echo "Info  : Deploy scenario is overriden by job to $DEPLOY_SCENARIO"
-      ;;
-    ironic)
-      export DEPLOY_SCENARIO="ubuntu1804"
-      ;;
-    *) echo "ERROR : Invalid stack $ENGINE_COMPONENT"; exit 1;;
-  esac
-
-  export STACK_VERSION="$GERRIT_BRANCH"
-
   # log info to console
   echo "        STACK_TYPE=$STACK_TYPE"
   echo "        DEPLOY_SCENARIO=$DEPLOY_SCENARIO"
diff --git a/jjb/engine/verify-jobs/ironic-verify-package.yaml b/jjb/engine/verify-jobs/ironic-verify-package.yaml
index a43e1ec4a..98dcd8895 100644
--- a/jjb/engine/verify-jobs/ironic-verify-package.yaml
+++ b/jjb/engine/verify-jobs/ironic-verify-package.yaml
@@ -32,7 +32,7 @@
           failed: false
           unstable: false
           notbuilt: false
-          deploy-scenario: 'k8-calico-nofeature'
+          deploy-scenario: 'k8-multus-plugins'
 
     distro:
       - ubuntu1804
-- 
2.25.1