tcwg-gnu-builds,tcwg-dev-build: Split $buildnumber from $release_name

... to follow MakeRelease.job's convention.

Change-Id: I439d4cea648d6c84d56d5b303f7e19c904648743

3 files changed, 33 insertions, 16 deletions

diff --git a/tcwg-dev-build.yaml b/tcwg-dev-build.yaml
index bad97ce17a..2b767f2626 100644
--- a/tcwg-dev-build.yaml
+++ b/tcwg-dev-build.yaml
@@ -17,7 +17,11 @@
         - string:
             name: release_name
             default: default
-            description: 'Release name; default is "date +%Y%m%d-%H_%M_%S"'
+            description: 'Name of release series; default is "date +%Y%m%d-%H_%M_%S"'
+        - string:
+            name: buildnumber
+            default: 0
+            description: 'Build number in release series'
         - choice:
             name: target
             choices:
@@ -105,6 +109,7 @@
             ./docker-run.sh --distro "$distro" -- ./tcwg-dev-build.sh \
             --abe_branch "$abe_branch" \
             --release_name "$release_name" \
+            --buildnumber "$buildnumber" \
             --target "$target" \
             --version "$version" \
             --manifest "$(pwd)/manifest.txt" \
diff --git a/tcwg-gnu-builds.yaml b/tcwg-gnu-builds.yaml
index 5e8edc6f03..ca0c697e58 100644
--- a/tcwg-gnu-builds.yaml
+++ b/tcwg-gnu-builds.yaml
@@ -43,7 +43,11 @@
       - string:
           name: release_name
           default: test
-          description: 'Release name'
+          description: 'Name of release series'
+      - string:
+          name: buildnumber
+          default: 0
+          description: 'Build number in release series'
       - choice:
           name: version
           choices:
@@ -84,7 +88,7 @@
       - timed: "H H H/7 * *"
     wrappers:
       - build-name:
-          name: '#$BUILD_NUMBER-$release_name'
+          name: '#$BUILD_NUMBER-$release_name-$buildnumber'
       - timeout:
           timeout: 300
       - timestamps
@@ -104,6 +108,7 @@
           
           cat > build-params.txt <<EOF
           release_name=$release_name
+          buildnumber=$buildnumber
           version=$version
           distro=$distro
           EOF
@@ -202,12 +207,12 @@
 
           i="$TRIGGERED_BUILD_RUN_COUNT_TCWG_DEV_BUILD"
           while [ $i -gt 0 ]; do
-            rsync -a tcwg-dev-build-$i/binaries/ out/
+            rsync -a tcwg-dev-build-$i/artifacts/binaries/ out/
             i=$(($i-1))
           done
 
           cat > HEADER-latest-rel.textile <<EOF
-          h4. Linaro Toolchain Upstream Integration Builds - Stable $release_name
+          h4. Linaro Toolchain Upstream Integration Builds - Stable $release_name-$buildnumber
           
           These builds are made from latest release branches of GNU toolchain
           components.  See included manifests for details.
@@ -218,7 +223,7 @@
           EOF
 
           cat > HEADER-master.textile <<EOF
-          h4. Linaro Toolchain Upstream Integration Builds - *UNSTABLE* $release_name
+          h4. Linaro Toolchain Upstream Integration Builds - *UNSTABLE* $release_name-$buildnumber
           
           These builds are made from whatever happened to be in master branches
           of GNU toolchain components at the moment.  See included manifests for details.
@@ -229,7 +234,7 @@
           "Linaro Bugzilla":https://bugs.linaro.org/ and upstream project issue trackers.
           EOF
 
-          cp HEADER-$version.textile out/*-$release_name-*/HEADER.textile
+          cp HEADER-$version.textile out/*-$release_name-$buildnumber/HEADER.textile
 
           wget https://git.linaro.org/ci/publishing-api.git/plain/linaro-cp.py -O ./linaro-cp.py
           linaro_cp_opts=""
@@ -265,7 +270,8 @@
 
           # Release name is Year.Month-Week_of_month
           cat > build-params.txt <<EOF
-          release_name=$(date +%Y.%m)-1
+          release_name=$(date +%Y.%m)
+          buildnumber=1
           publish=true
           EOF
       - trigger-builds:
@@ -279,4 +285,4 @@
             predefined-parameters: |
               version=master
               distro=focal
-# checksum: d6a070e86ee72fda25595a37de9ff258
+# checksum: a269cf574c94c5223ff70ac78d5aa8b7
diff --git a/tcwg-gnu-builds.yaml.in b/tcwg-gnu-builds.yaml.in
index 29b5e8466e..acc6fa76d5 100644
--- a/tcwg-gnu-builds.yaml.in
+++ b/tcwg-gnu-builds.yaml.in
@@ -10,7 +10,11 @@
       - string:
           name: release_name
           default: test
-          description: 'Release name'
+          description: 'Name of release series'
+      - string:
+          name: buildnumber
+          default: 0
+          description: 'Build number in release series'
       - choice:
           name: version
           choices:
@@ -51,7 +55,7 @@
       - timed: "H H H/7 * *"
     wrappers:
       - build-name:
-          name: '#$BUILD_NUMBER-$release_name'
+          name: '#$BUILD_NUMBER-$release_name-$buildnumber'
       - timeout:
           timeout: 300
       - timestamps
@@ -71,6 +75,7 @@
           
           cat > build-params.txt <<EOF
           release_name=$release_name
+          buildnumber=$buildnumber
           version=$version
           distro=$distro
           EOF
@@ -169,12 +174,12 @@
 
           i="$TRIGGERED_BUILD_RUN_COUNT_TCWG_DEV_BUILD"
           while [ $i -gt 0 ]; do
-            rsync -a tcwg-dev-build-$i/binaries/ out/
+            rsync -a tcwg-dev-build-$i/artifacts/binaries/ out/
             i=$(($i-1))
           done
 
           cat > HEADER-latest-rel.textile <<EOF
-          h4. Linaro Toolchain Upstream Integration Builds - Stable $release_name
+          h4. Linaro Toolchain Upstream Integration Builds - Stable $release_name-$buildnumber
           
           These builds are made from latest release branches of GNU toolchain
           components.  See included manifests for details.
@@ -185,7 +190,7 @@
           EOF
 
           cat > HEADER-master.textile <<EOF
-          h4. Linaro Toolchain Upstream Integration Builds - *UNSTABLE* $release_name
+          h4. Linaro Toolchain Upstream Integration Builds - *UNSTABLE* $release_name-$buildnumber
           
           These builds are made from whatever happened to be in master branches
           of GNU toolchain components at the moment.  See included manifests for details.
@@ -196,7 +201,7 @@
           "Linaro Bugzilla":https://bugs.linaro.org/ and upstream project issue trackers.
           EOF
 
-          cp HEADER-$version.textile out/*-$release_name-*/HEADER.textile
+          cp HEADER-$version.textile out/*-$release_name-$buildnumber/HEADER.textile
 
           wget https://git.linaro.org/ci/publishing-api.git/plain/linaro-cp.py -O ./linaro-cp.py
           linaro_cp_opts=""
@@ -232,7 +237,8 @@
 
           # Release name is Year.Month-Week_of_month
           cat > build-params.txt <<EOF
-          release_name=$(date +%Y.%m)-1
+          release_name=$(date +%Y.%m)
+          buildnumber=1
           publish=true
           EOF
       - trigger-builds: