Use lf-infra-parameters

RELEASE_BRANCH is actually just GERRIT_BRANCH so simplify scripts by
removing parameter duplication.

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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 4a34eaf5a46c023c2ff1445c0715b7b0ed205227..eab728fb963216663446a94bc1303b555c80a972 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -8,14 +8,6 @@
           default: '{release-tag}'
           description: "The Release train tag to use eg. Beryllium-SR1"
 
-- parameter:
-    name: autorelease-release-branch
-    parameters:
-      - string:
-          name: RELEASE_BRANCH
-          default: '{release-branch}'
-          description: "The Release train branch to base build off eg. stable/beryllium"
-
 - wrapper:
     name: autorelease-build-timeout
     wrappers:

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index aea8a08ff187cfe4448816bd9f697f11ec847c8e..8422635f3572b67def9ca13a285aebbac847fa2d 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -19,18 +19,14 @@
     parameters:
       - maven-exec:
           maven-version: 'mvn33'
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
+      - lf-infra-parameters:
           project: '{project}'
+          stream: '{stream}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - autorelease-release-tag:
           release-tag: '{next-release-tag}'
-      - autorelease-release-branch:
-          release-branch: '{branch}'
       - string:
           name: EXTRA_MVN_OPTS
           default: '{extra-mvn-opts}'
@@ -42,6 +38,10 @@
               -Dskip.karaf.featureTest=true  # To disable karaf SingleFeatureTests
               --fail-never   # NEVER fail the build, regardless of project result
               --fail-at-end  # Only fail the build afterwards; allow all non-impacted builds to continue
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - git:
@@ -324,18 +324,16 @@
     jdk: '{jdk}'
 
     properties:
-      - opendaylight-infra-properties:
+      - lf-infra-properties:
           build-days-to-keep: 7
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
+      - lf-infra-parameters:
           project: '{project}'
+          stream: '{stream}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
       - autorelease-release-tag:
-          release-tag: 'validate'
+          release-tag: validate
       - string:
           name: CLONE_URL
           default: '{git-url}/releng/autorelease'
@@ -374,7 +372,7 @@
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: mvn33
           pom: validate-pom.xml
           goals: |
               clean install dependency:tree
@@ -383,22 +381,22 @@
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g'
-          settings: 'autorelease-settings'
+          settings: autorelease-settings
           settings-type: cfp
-          global-settings: 'global-settings'
+          global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
-          maven-version: 'mvn33'
-          pom: 'pom.xml'
+          maven-version: mvn33
+          pom: pom.xml
           goals: |
               clean validate
               -Pq
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: 'autorelease-settings'
+          settings: autorelease-settings
           settings-type: cfp
-          global-settings: 'global-settings'
+          global-settings: global-settings
           global-settings-type: cfp
 
     publishers:

diff --git a/jjb/autorelease/prepare-release.sh b/jjb/autorelease/prepare-release.sh
index f68329349e778a5ac6139a691b6235d710ebab59..e9ae14a814deb3ff4a3959c22780b19806310df1 100644 (file)
--- a/jjb/autorelease/prepare-release.sh
+++ b/jjb/autorelease/prepare-release.sh
@@ -16,7 +16,8 @@
 # 4) Create tarball for distribution.
 
 # RELEASE_TAG=Beryllium-SR1  # Example
-# RELEASE_BRANCH=stable/beryllium  # Example
+
+echo "---> prepare-release.sh"
 
 # Set release tag as $STREAM, when no release tag is passed
 RELEASE_TAG="${RELEASE_TAG:-${STREAM^}}"
@@ -47,7 +48,7 @@ mv taglist.log "$PATCH_DIR" || true
 modules=$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml)
 for module in $modules; do
     pushd "$module"
-    git format-patch --stdout "origin/$RELEASE_BRANCH" > "$PATCH_DIR/${module//\//-}.patch"
+    git format-patch --stdout "origin/$GERRIT_BRANCH" > "$PATCH_DIR/${module//\//-}.patch"
     git bundle create "$PATCH_DIR/${module//\//-}.bundle" "origin/master..HEAD"
     popd
 done