rpb-openembedded: make publishing generic

Use Base_URL and PUB_DEST parameters to set the publishin path.
The PUB_DEST parameter will be used by the code snippet for publishing.

Change-Id: I8105cffd871f03d01611ab363fd11480c509e2e4
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>

8 files changed, 70 insertions, 78 deletions

diff --git a/lt-qcom-openembedded-rpb-morty.yaml b/lt-qcom-openembedded-rpb-morty.yaml
index 1eb2bdbcc3..badfa4361a 100644
--- a/lt-qcom-openembedded-rpb-morty.yaml
+++ b/lt-qcom-openembedded-rpb-morty.yaml
@@ -29,7 +29,7 @@
             default: 'morty'
         - string:
             name: BASE_URL
-            default: 'https://builds.96boards.org/snapshots/${MACHINE}/linaro/openembedded/${MANIFEST_BRANCH}/${DISTRO}/${BUILD_NUMBER}'
+            default: 'https://builds.96boards.org/'
     disabled: false
     node: master
     display-name: 'Qualcomm OpenEmbedded RPB (morty)'
@@ -60,12 +60,6 @@
             users:
                 - 'OE_COMMIT_BOT_KEY'
     builders:
-        - shell:
-            !include-raw: rpb-openembedded/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token:
-            host: builds.96boards.org
         - shell: |
             #!/bin/bash
 
@@ -79,14 +73,17 @@
                 ;;
             esac
 
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ \
-              snapshots/${MACHINE}/linaro/openembedded/${MANIFEST_BRANCH}/${DISTRO}/${BUILD_NUMBER}
+            echo "PUB_DEST=snapshots/${MACHINE}/linaro/openembedded/${MANIFEST_BRANCH}/${DISTRO}/${BUILD_NUMBER}" > pub_dest_parameters
+        - inject:
+            properties-file: pub_dest_parameters
+        - shell:
+            !include-raw: rpb-openembedded/builders.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token:
+            host: builds.96boards.org
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
     publishers:
         - email-ext:
             recipients: 'fathi.boudra@linaro.org, nicolas.dechesne@linaro.org'
diff --git a/rpb-openembedded-jethro.yaml b/rpb-openembedded-jethro.yaml
index 3bedf69354..bf04da77b6 100644
--- a/rpb-openembedded-jethro.yaml
+++ b/rpb-openembedded-jethro.yaml
@@ -25,6 +25,12 @@
             name: MANIFEST_BRANCH
             default: 'jethro'
         - string:
+            name: BASE_URL
+            default: 'https://builds.96boards.org/'
+        - string:
+            name: PUB_DEST
+            default: 'snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NUMBER}'
+        - string:
             name: BUNDLE_STREAM_NAME
             default: '/public/team/linaro/rpb-openembedded-${MANIFEST_BRANCH}/'
         - string:
@@ -70,17 +76,8 @@
             properties-file: post_build_lava_parameters
         - linaro-publish-token:
             host: builds.96boards.org
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ \
-              snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NUMBER}
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
         - shell: |
             case "${MACHINE}" in
               dragonboard-410c)
diff --git a/rpb-openembedded-krogoth.yaml b/rpb-openembedded-krogoth.yaml
index 840ee6f9db..4a6162ac81 100644
--- a/rpb-openembedded-krogoth.yaml
+++ b/rpb-openembedded-krogoth.yaml
@@ -25,6 +25,12 @@
             name: MANIFEST_BRANCH
             default: 'krogoth'
         - string:
+            name: BASE_URL
+            default: 'https://builds.96boards.org/'
+        - string:
+            name: PUB_DEST
+            default: 'snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NUMBER}'
+        - string:
             name: BUNDLE_STREAM_NAME
             default: '/public/team/linaro/rpb-openembedded-${MANIFEST_BRANCH}/'
         - string:
@@ -71,17 +77,8 @@
             properties-file: post_build_lava_parameters
         - linaro-publish-token:
             host: builds.96boards.org
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ \
-              snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NUMBER}
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
         - shell: |
             case "${MACHINE}" in
               dragonboard-410c)
diff --git a/rpb-openembedded-master.yaml b/rpb-openembedded-master.yaml
index 241b9e0a41..6070c6db1f 100644
--- a/rpb-openembedded-master.yaml
+++ b/rpb-openembedded-master.yaml
@@ -25,6 +25,12 @@
             name: MANIFEST_BRANCH
             default: 'master'
         - string:
+            name: BASE_URL
+            default: 'https://builds.96boards.org/'
+        - string:
+            name: PUB_DEST
+            default: 'snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NUMBER}'
+        - string:
             name: BUNDLE_STREAM_NAME
             default: '/public/team/linaro/rpb-openembedded-${MANIFEST_BRANCH}/'
         - string:
@@ -74,17 +80,8 @@
             properties-file: post_build_lava_parameters
         - linaro-publish-token:
             host: builds.96boards.org
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ \
-              snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NUMBER}
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
         - shell: |
             case "${MACHINE}" in
               dragonboard-410c)
diff --git a/rpb-openembedded-morty.yaml b/rpb-openembedded-morty.yaml
index 0a4b442d7e..8a219c3421 100644
--- a/rpb-openembedded-morty.yaml
+++ b/rpb-openembedded-morty.yaml
@@ -25,6 +25,12 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
+            name: BASE_URL
+            default: 'https://builds.96boards.org/'
+        - string:
+            name: PUB_DEST
+            default: 'snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NUMBER}'
+        - string:
             name: BUNDLE_STREAM_NAME
             default: '/public/team/linaro/rpb-openembedded-${MANIFEST_BRANCH}/'
         - string:
@@ -75,17 +81,8 @@
             properties-file: post_build_lava_parameters
         - linaro-publish-token:
             host: builds.96boards.org
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ \
-              snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NUMBER}
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
         - shell: |
             case "${MACHINE}" in
               dragonboard-410c)
diff --git a/rpb-openembedded-pyro.yaml b/rpb-openembedded-pyro.yaml
index db271e1666..55c6f179ef 100644
--- a/rpb-openembedded-pyro.yaml
+++ b/rpb-openembedded-pyro.yaml
@@ -25,6 +25,12 @@
             name: MANIFEST_BRANCH
             default: 'pyro'
         - string:
+            name: BASE_URL
+            default: 'https://builds.96boards.org/'
+        - string:
+            name: PUB_DEST
+            default: 'snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NUMBER}'
+        - string:
             name: BUNDLE_STREAM_NAME
             default: '/public/team/linaro/rpb-openembedded-${MANIFEST_BRANCH}/'
         - string:
@@ -73,17 +79,8 @@
             properties-file: post_build_lava_parameters
         - linaro-publish-token:
             host: builds.96boards.org
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ \
-              snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NUMBER}
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
         - shell: |
             case "${MACHINE}" in
               dragonboard-410c)
diff --git a/rpb-openembedded/builders.sh b/rpb-openembedded/builders.sh
index 28562ea3d1..61ceb669e7 100755
--- a/rpb-openembedded/builders.sh
+++ b/rpb-openembedded/builders.sh
@@ -137,8 +137,7 @@ Build description:
 * Manifest commit: "${MANIFEST_COMMIT}":https://github.com/96boards/oe-rpb-manifest/commit/${MANIFEST_COMMIT}
 EOF
 
-# Set base url, and allow the main job script to override the default value, typically used for OE RPB builds
-BASE_URL=${BASE_URL:-https://builds.96boards.org/snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NUMBER}}
+# Need different files for each machine
 BOOT_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "boot-*-${MACHINE}-*-${BUILD_NUMBER}.img" | xargs -r basename)
 ROOTFS_EXT4_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lava-${MACHINE}-*-${BUILD_NUMBER}.rootfs.ext4.gz" | xargs -r basename)
 ROOTFS_TARXZ_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lava-${MACHINE}-*-${BUILD_NUMBER}.rootfs.tar.xz" | xargs -r basename)
@@ -152,12 +151,14 @@ case "${MACHINE}" in
     ;;
 esac
 
+# Note: the main job script allows to override the default value for
+#       BASE_URL and PUB_DEST, typically used for OE RPB builds
 cat << EOF > ${WORKSPACE}/post_build_lava_parameters
 DEPLOY_DIR_IMAGE=${DEPLOY_DIR_IMAGE}
-BOOT_URL=${BASE_URL}/${BOOT_IMG}
-ROOTFS_BUILD_URL=${BASE_URL}/${ROOTFS_EXT4_IMG}
-SYSTEM_URL=${BASE_URL}/${ROOTFS_EXT4_IMG}
-KERNEL_URL=${BASE_URL}/${KERNEL_IMG}
-DTB_URL=${BASE_URL}/${DTB_IMG}
-NFSROOTFS_URL=${BASE_URL}/${ROOTFS_TARXZ_IMG}
+BOOT_URL=${BASE_URL}${PUB_DEST}/${BOOT_IMG}
+ROOTFS_BUILD_URL=${BASE_URL}${PUB_DEST}/${ROOTFS_EXT4_IMG}
+SYSTEM_URL=${BASE_URL}${PUB_DEST}/${ROOTFS_EXT4_IMG}
+KERNEL_URL=${BASE_URL}${PUB_DEST}/${KERNEL_IMG}
+DTB_URL=${BASE_URL}${PUB_DEST}/${DTB_IMG}
+NFSROOTFS_URL=${BASE_URL}${PUB_DEST}/${ROOTFS_TARXZ_IMG}
 EOF
diff --git a/rpb-openembedded/publishers.sh b/rpb-openembedded/publishers.sh
new file mode 100755
index 0000000000..12d72385a2
--- /dev/null
+++ b/rpb-openembedded/publishers.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Publish
+test -d ${HOME}/bin || mkdir ${HOME}/bin
+wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+time python ${HOME}/bin/linaro-cp.py \
+  --server ${PUBLISH_SERVER} \
+  --link-latest \
+  ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}