From 3bb0af4044d20e81b4a505c7fb03091154ea3f5b Mon Sep 17 00:00:00 2001
From: meimei <meimei@huawei.com>
Date: Fri, 3 Feb 2017 17:12:53 +0800
Subject: adjust parameters setting
Change-Id: I0999ec19896b5c80e9b6c9de469e7fbe36237b0d
Signed-off-by: meimei <meimei@huawei.com>
---
jjb/opera/opera-daily-jobs.yml | 34 +++++-----------------------------
1 file changed, 5 insertions(+), 29 deletions(-)
(limited to 'jjb')
diff --git a/jjb/opera/opera-daily-jobs.yml b/jjb/opera/opera-daily-jobs.yml
index 47aa2a43d..fa67d5cec 100644
--- a/jjb/opera/opera-daily-jobs.yml
+++ b/jjb/opera/opera-daily-jobs.yml
@@ -63,9 +63,6 @@
project: '{project}'
branch: '{branch}'
- 'huawei-virtual7-defaults'
- - 'compass-defaults'
- - 'opera-compass-parameter':
- gs-pathname: '{gs-pathname}'
builders:
- description-setter:
@@ -84,7 +81,10 @@
condition: SUCCESSFUL
projects:
- name: 'compass-deploy-virtual-daily-{stream}'
- current-parameters: true
+ current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO=os-nosdn-openo-noha
+ COMPASS_OS_VERSION=xenial
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
@@ -93,7 +93,7 @@
# condition: SUCCESSFUL
# projects:
# - name: 'functest-compass-baremetal-suite-{stream}'
-# current-parameters: true
+# current-parameters: false
# predefined-parameters:
# FUNCTEST_SUITE_NAME=opera
# node-parameters: true
@@ -145,27 +145,3 @@
#!/bin/bash
echo "Hello world!"
-########################
-# parameter macros
-########################
-- parameter:
- name: opera-compass-parameter
- parameters:
- - string:
- name: BUILD_DIRECTORY
- default: $WORKSPACE/build_output
- description: "Directory where the build artifact will be located upon the completion of the build."
- - string:
- name: GS_URL
- default: '$GS_BASE{gs-pathname}'
- description: "URL to Google Storage."
- - choice:
- name: COMPASS_OPENSTACK_VERSION
- choices:
- - 'newton'
- - string:
- name: DEPLOY_SCENARIO
- default: 'os-nosdn-openo-noha'
- - string:
- name: COMPASS_OS_VERSION
- default: 'xenial'
--
cgit