From 39de4fa777de1d8b7887c5b5c011f498308dc5fc Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 13 Dec 2016 15:58:15 +0100 Subject: [PATCH] 3rd party ci: Pass APEX_ENV_NUMBER to apex-create-vms job Change-Id: I073a27045db93fcf3c9906abe1c18ad3d26743b2 Signed-off-by: Fatih Degirmenci --- jjb/3rd_party_ci/odl-netvirt.yml | 3 ++- jjb/global/slave-params.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml index 54d1e4353..70f8c7359 100644 --- a/jjb/3rd_party_ci/odl-netvirt.yml +++ b/jjb/3rd_party_ci/odl-netvirt.yml @@ -56,7 +56,7 @@ branch: '{branch}' - string: name: NETVIRT_ARTIFACT - default: $WORKSPACE/distribution-karaf.tar.gz" + default: $WORKSPACE/distribution-karaf.tar.gz - 'ericsson-virtual6-defaults' scm: @@ -100,6 +100,7 @@ GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT + APEX_ENV_NUMBER=$APEX_ENV_NUMBER node-parameters: false kill-phase-on: FAILURE abort-all-job: true diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 96ad75c69..a8dae739a 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -692,7 +692,7 @@ description: 'Git URL to use on this Jenkins Slave' - string: name: APEX_ENV_NUMBER - default: 0 + default: '"0"' description: 'The number of the Apex environment on the machine' ##################################################### # These slaves are just dummy slaves for sandbox jobs -- 2.16.6