From: mei mei <meimei@huawei.com>
Date: Tue, 27 Feb 2018 00:59:49 +0000 (+0000)
Subject: Merge "[compass4nfv] add DEPLOY_SCENARIO macro"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8947b0fd89d1c40cb42cd48ba17094c4a94618e0;hp=e02c03e0446168ea490bf65f34a61245e3fd7f23;p=releng.git

Merge "[compass4nfv] add DEPLOY_SCENARIO macro"
---

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