summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2018-04-10 15:52:41 -0700
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2018-04-11 12:44:06 -0700
commita1affda5eb8a1f58c4143754a84a37276763dda5 (patch)
tree93fb0de618eca2a6a42bee473375268d6baae9b4 /jjb
parentd6bb024093f9c8427eaf966a4711d376997deb50 (diff)
Move DEPLOY_SCENARIO out of testapi-parameters
These have been moved back into installer-params.yml and added to the daisy jobs where 'testapi-parameters' is being used. Including this in the list of parameters would cause duplication as most installers already include 'DEPLOY_SCENARIO' as a parameter. The 'DEPLOY_SCENARIO' parameter is also sometimes defined through a macro, which could cause second declaration of DEPLOY_SCENARIO (defaulting to 'os-nosdn-nofeature-ha') to always be used. Documentation has been added to the parameter to explain the related macros and how they should be used. Change-Id: I9aef031dbcf523ae2db15695ce294bd85025530d Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/daisy4nfv/daisy-daily-jobs.yml2
-rw-r--r--jjb/global/installer-params.yml8
-rw-r--r--jjb/global/releng-macros.yml32
3 files changed, 38 insertions, 4 deletions
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 2eb27a663..0f2d917c3 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -121,6 +121,7 @@
- 'testapi-parameter'
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
+ - 'deploy-scenario'
builders:
- description-setter:
@@ -207,6 +208,7 @@
- 'testapi-parameter'
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
+ - 'deploy-scenario'
- string:
name: DEPLOY_TIMEOUT
default: '150'
diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index 683ef78ba..f663c4556 100644
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -146,3 +146,11 @@
name: EXTERNAL_NETWORK
default: 'external'
description: 'external network for test'
+
+- parameter:
+ name: 'deploy-scenario'
+ parameters:
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-nosdn-nofeature-ha'
+ description: "OPNFV deployment scenario"
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index 205802fab..d70e7e0a5 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -40,6 +40,34 @@
default: 'refs/heads/{branch}'
description: "Default refspec needed for manually triggering."
+##
+# Reporting Deployment Results
+#
+# To report deployment results to
+# http://testresults.opnfv.org/test/#/deployresults, add the following
+# parameters, builders, and publishers to a deployment job:
+#
+# parameters:
+# - testapi-parameter
+#
+# builders:
+# - track-begin-timestamp
+#
+# publishers:
+# - report-provision-result
+#
+# Note: The following string parameter must also exist, as they are used
+# when reporting the provision result:
+#
+# * INSTALLER
+# * INSTALLER_VERSION
+# * DEPLOY_SCENARIO
+#
+# most installers include these but you should verify first before
+# adding the publisher, otherwise the deployment build may be marked
+# unstable.
+#
+##
- parameter:
name: testapi-parameter
parameters:
@@ -48,10 +76,6 @@
default: 'http://testresults.opnfv.org/test/api/v1'
description: "Default TestAPI URL, currently using v1"
- string:
- name: DEPLOY_SCENARIO
- default: 'os-nosdn-nofeature-ha'
- description: "OPNFV deployment scenario"
- - string:
name: INSTALLER_VERSION
default: 'master'
description: "Installer release version"