Add datestamp and deploy to Nexus for Daily jobs

- Daily jobs now produce a datestamp at the end of the RELEASE_TAG
- Daily jobs will now deploy to Nexus as part of the build

Change-Id: I4187e77334b4c8e364fd3b766bd675ce44e1f72b
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/autorelease/autorelease-lithium.yaml b/jjb/autorelease/autorelease-lithium.yaml
index 289716996da4da64bd1cb0268bfba4db48dc5f1b..c5b5bd4d63952b1cb14044c50e87ecf00f206481 100644 (file)
--- a/jjb/autorelease/autorelease-lithium.yaml
+++ b/jjb/autorelease/autorelease-lithium.yaml
@@ -30,6 +30,8 @@
             release-tag: 'Daily'
         - autorelease-release-branch:
             release-branch: '{branch}'
+        - autorelease-release-datestamp:
+            datestamp: true
 
     scm:
         - git:
@@ -75,6 +77,11 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - maven-deploy:
+            url: 'https://nexus.opendaylight.org/content/repositories/opendaylight.daily/'
+            id: 'opendaylight.daily'
+            unique-version: true
+            deploy-unstable: true
         - archive-artifacts:
             artifacts: '*.log,patches/*.patch'
         - email-notification:
@@ -100,6 +107,8 @@
             release-tag: 'Pre-Lithium'
         - autorelease-release-branch:
             release-branch: '{branch}'
+        - autorelease-release-datestamp:
+            datestamp: false
 
     scm:
         - git:

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 7c58fc4f0cd73d1ec35a41c607d1ba219c21f949..0dc4337d4efa862556c2e20fbf76c263ba41bf72 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -15,6 +15,14 @@
             default: '{release-branch}'
             description: "The Release train branch to base build off eg. stable/helium"
 
+- parameter:
+    name: autorelease-release-datestamp
+    parameters:
+        - bool:
+            name: DATESTAMP
+            default: '{datestamp}'
+            description: "Whether to include a datestamp or not"
+
 - wrapper:
     name: autorelease-build-timeout
     wrappers:

diff --git a/jjb/autorelease/autorelease-master.yaml b/jjb/autorelease/autorelease-master.yaml
index 74412f12c7dc2fa50ab08b25db349e3ec007f096..7d3a443b5e61ad38d6e7a32dcc0bb7a6e9078ac1 100644 (file)
--- a/jjb/autorelease/autorelease-master.yaml
+++ b/jjb/autorelease/autorelease-master.yaml
@@ -29,6 +29,8 @@
             release-tag: 'Daily'
         - autorelease-release-branch:
             release-branch: '{branch}'
+        - autorelease-release-datestamp:
+            datestamp: true
 
     scm:
         - git:
@@ -74,6 +76,11 @@
         - jacoco-nojava-workaround
 
     publishers:
+        - maven-deploy:
+            url: 'https://nexus.opendaylight.org/content/repositories/opendaylight.daily/'
+            id: 'opendaylight.daily'
+            unique-version: true
+            deploy-unstable: true
         - archive-artifacts:
             artifacts: '*.log,patches/*.patch'
         - email-notification:

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index 7fdab6412654923602214a762898cb9650c7d092..bbf90e22614231696a4b21a06d11de19955630ac 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -9,9 +9,15 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
+# DATESTAMP=true  # Example
 # RELEASE_TAG=Helium-SR2  # Example
 # RELEASE_BRANCH=stable/helium  # Example
 
+if [ "$DATESTAMP" == "true" ]; then
+   export RELEASE_TAG=$RELEASE_TAG-`date -u +v%Y%m%d%H%M`
+fi
+
+echo $RELEASE_TAG
 ./scripts/version.sh release $RELEASE_TAG
 git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"