Add KARAF_VERSION to variables.prop file

- This way the variable can be passed to distribution test job.
- With this change autorelease can generate and trigger test for
either k3 or k4 distribution. With this change k3 is default.
- Ideally it should be possible to generate and trigger test for
both distributions k3 and k4 but the way the scripts are written
today in autorelease it seems like too much rework.

Change-Id: I7708c95e7ee889a1eae93f05003a630dac06ccc2
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index c622cd4f4e3e488237b803705bd7fb7610128307..c00cfb15c6e6e138382877cb36b822d9bc3a26af 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -11,6 +11,7 @@
           branch: 'master'
           jdk: 'openjdk8'
           integration-test: nitrogen
+          karaf-version: karaf3
       - carbon:
           next-release-tag: Carbon
           branch: 'stable/carbon'

diff --git a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
index b90d959a788a8e96db8917d475239a3db424980c..941106e5a8a507a2d06b977dc8bfff0b2b16029a 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
+++ b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
@@ -23,6 +23,7 @@ STAGING_REPO_ID=$(grep "Created staging repository with ID" "$WORKSPACE/deploy-s
 BUNDLE_URL="${NEXUSURL}/${STAGING_REPO_ID}/org/opendaylight/integration/${KARAF_ARTIFACT}/${VERSION}/${KARAF_ARTIFACT}-${VERSION}.zip"
 echo STAGING_REPO_ID="$STAGING_REPO_ID" >> "$WORKSPACE/variables.prop"
 echo BUNDLE_URL="$BUNDLE_URL" >> "$WORKSPACE/variables.prop"
+echo KARAF_VERSION="$KARAF_VERSION" >> "$WORKSPACE/variables.prop"
 echo "BUNDLE_URL: ${BUNDLE_URL}"
 
 # Copy variables.prop to variables.jenkins-trigger so that the end of build