From: wutianwei <wutianwei1@huawei.com>
Date: Sat, 24 Feb 2018 09:55:01 +0000 (+0800)
Subject: [compass4nfv] add DEPLOY_SCENARIO macro
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F52579%2F3;p=releng.git

[compass4nfv] add DEPLOY_SCENARIO macro

fix the error Unrecognized macro 'DEPLOY_SCENARIO' and deploy failed.

Change-Id: Ic34a0d99c2a6026303046c2b350da205372ec78e
Signed-off-by: wutianwei <wutianwei1@huawei.com>
---

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 81d76d559..740844702 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -168,9 +168,6 @@
           installer: '{installer}'
           gs-pathname: '{gs-pathname}'
           ppa-pathname: '{ppa-pathname}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: '{scenario}'
       - '{slave-label}-defaults'
       - '{installer}-defaults'
 
@@ -429,6 +426,17 @@
           name: LOG_DIRECTORY
           default: $WORKSPACE/log_output
           description: "Directory where the logs will be located upon the completion of the collection."
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-nosdn-nofeature-ha'
+          description: "Scenario to deploy with."
+      - string:
+          name: COMPASS_OS_VERSION
+          default: ''
+      - string:
+          name: COMPASS_OPENSTACK_VERSION
+          default: ''
+
 
 ########################
 # trigger macros