diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-04-12 17:07:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-12 17:07:21 +0000 |
| commit | a7530584a166fc1b2129a88d3ab52710f6945c63 (patch) | |
| tree | 82fa09e24d4f08d6c8dc3898bcaf3a481135f012 | |
| parent | e99861f4bf3ddb3c5bf4edd4458ef0a690345f3f (diff) | |
| parent | a1affda5eb8a1f58c4143754a84a37276763dda5 (diff) | |
Merge "Move DEPLOY_SCENARIO out of testapi-parameters"
| -rw-r--r-- | jjb/daisy4nfv/daisy-daily-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/global/installer-params.yml | 8 | ||||
| -rw-r--r-- | jjb/global/releng-macros.yml | 32 |
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" |