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>

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 2eb27a6..0f2d917 100644 (file)
--- 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 683ef78..f663c45 100644 (file)
--- 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 205802f..d70e7e0 100644 (file)
--- 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:
@@ -47,10 +75,6 @@
           name: TESTAPI_URL
           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'