Merge "Use lf-infra-parameters"

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 5c699986fd2c2ba26ff6773b83ff39df02354cef..7cdc433707b82611fb20d98a59cf7e7358c7e74b 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -18,18 +18,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}'
@@ -41,6 +37,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:

diff --git a/jjb/autorelease/prepare-release.sh b/jjb/autorelease/prepare-release.sh
index d9c92e7377113915ad27eaab6dfe5299b81da995..0b025ec9b6cd1a4d4b395323364249a736e24ddc 100644 (file)
--- a/jjb/autorelease/prepare-release.sh
+++ b/jjb/autorelease/prepare-release.sh
@@ -16,7 +16,6 @@
 # 4) Create tarball for distribution.
 
 # RELEASE_TAG=Beryllium-SR1  # Example
-# RELEASE_BRANCH=stable/beryllium  # Example
 
 # Set release tag as $STREAM, when no release tag is passed
 RELEASE_TAG="${RELEASE_TAG:-${STREAM^}}"
@@ -47,7 +46,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/$BRANCH" > "$PATCH_DIR/${module//\//-}.patch"
     git bundle create "$PATCH_DIR/${module//\//-}.bundle" "origin/master..HEAD"
     popd
 done

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 3cd9c2cb82d95ff68387785d2840e66dca6961d6..3a118cf8924994ca7f5ae799453db6167fcd10cf 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -348,8 +348,6 @@
           artifacts: '{archive-artifacts}'
       - autorelease-release-tag:
           release-tag: 'validate'
-      - autorelease-release-branch:
-          release-branch: '{branch}'
       - string:
           name: CLONE_URL
           default: '{git-url}/releng/autorelease'