5 files changed, 58 insertions, 20 deletions
diff --git a/rpb-openembedded-jethro.yaml b/rpb-openembedded-jethro.yaml
index f864352015..590b53fc5a 100644
--- a/rpb-openembedded-jethro.yaml
+++ b/rpb-openembedded-jethro.yaml
@@ -63,12 +63,23 @@
         - matrix-tie-parent:
             node: master
     builders:
-        - linaro-publish-token:
-            host: builds.96boards.org
         - shell:
             !include-raw: rpb-openembedded/builders.sh
         - inject:
             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}/${MACHINE0}/${DISTRO}/${BUILD_NUMBER}
         - shell: |
             case "${MACHINE}" in
               dragonboard-410c)
diff --git a/rpb-openembedded-krogoth.yaml b/rpb-openembedded-krogoth.yaml
index 905431fc89..5854483eda 100644
--- a/rpb-openembedded-krogoth.yaml
+++ b/rpb-openembedded-krogoth.yaml
@@ -64,12 +64,23 @@
         - matrix-tie-parent:
             node: master
     builders:
-        - linaro-publish-token:
-            host: builds.96boards.org
         - shell:
             !include-raw: rpb-openembedded/builders.sh
         - inject:
             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}/${MACHINE0}/${DISTRO}/${BUILD_NUMBER}
         - shell: |
             case "${MACHINE}" in
               dragonboard-410c)
diff --git a/rpb-openembedded-master.yaml b/rpb-openembedded-master.yaml
index d869aab3d7..6f8f7bbcc4 100644
--- a/rpb-openembedded-master.yaml
+++ b/rpb-openembedded-master.yaml
@@ -63,12 +63,23 @@
         - matrix-tie-parent:
             node: master
     builders:
-        - linaro-publish-token:
-            host: builds.96boards.org
         - shell:
             !include-raw: rpb-openembedded/builders.sh
         - inject:
             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}/${MACHINE0}/${DISTRO}/${BUILD_NUMBER}
         - shell: |
             case "${MACHINE}" in
               dragonboard-410c)
diff --git a/rpb-openembedded-morty.yaml b/rpb-openembedded-morty.yaml
index 807cb433d3..a7f2bb64c8 100644
--- a/rpb-openembedded-morty.yaml
+++ b/rpb-openembedded-morty.yaml
@@ -63,12 +63,23 @@
         - matrix-tie-parent:
             node: master
     builders:
-        - linaro-publish-token:
-            host: builds.96boards.org
         - shell:
             !include-raw: rpb-openembedded/builders.sh
         - inject:
             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}/${MACHINE0}/${DISTRO}/${BUILD_NUMBER}
         - shell: |
             case "${MACHINE}" in
               dragonboard-410c)
diff --git a/rpb-openembedded/builders.sh b/rpb-openembedded/builders.sh
index f3500b5457..1cad52bf5a 100755
--- a/rpb-openembedded/builders.sh
+++ b/rpb-openembedded/builders.sh
@@ -83,6 +83,7 @@ cat conf/{site,auto}.conf
 # Split machine:machine2 and pass it to secondary image.
 IFS=':' read -ra SPLITMACHINES <<< "${MACHINE}"
 unset IFS
+MACHINE0="${SPLITMACHINES[0]}"
 
 [ "${DISTRO}" = "rpb" ] && IMAGES+=" rpb-desktop-image rpb-desktop-image-lava"
 [ "${DISTRO}" = "rpb-wayland" ]  && IMAGES+=" rpb-weston-image rpb-weston-image-lava"
@@ -134,20 +135,13 @@ Build description:
 * Manifest commit: "${MANIFEST_COMMIT}":https://github.com/96boards/oe-rpb-manifest/commit/${MANIFEST_COMMIT}
 EOF
 
-# 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}
-
 # Ignore error as we always want to create post_build_lava_parameters
 set +e
 
 cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-BOOT_URL=http://builds.96boards.org/snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NUMBER}/$(ls ${DEPLOY_DIR_IMAGE}/boot-*-${MACHINE}-*-${BUILD_NUMBER}.img | xargs basename)
-ROOTFS_BUILD_URL=http://builds.96boards.org/snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NUMBER}/$(ls ${DEPLOY_DIR_IMAGE}/rpb-console-image-lava-${MACHINE}-*-${BUILD_NUMBER}.rootfs.ext4.gz | xargs basename)
-SYSTEM_URL=http://builds.96boards.org/snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NUMBER}/$(ls ${DEPLOY_DIR_IMAGE}/rpb-console-image-lava-${MACHINE}-*-${BUILD_NUMBER}.rootfs.ext4.gz | xargs basename)
+MACHINE0=${MACHINE0}
+DEPLOY_DIR_IMAGE=${DEPLOY_DIR_IMAGE}
+BOOT_URL=http://builds.96boards.org/snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE0}/${DISTRO}/${BUILD_NUMBER}/$(ls ${DEPLOY_DIR_IMAGE}/boot-*-${MACHINE0}-*-${BUILD_NUMBER}.img | xargs basename)
+ROOTFS_BUILD_URL=http://builds.96boards.org/snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE0}/${DISTRO}/${BUILD_NUMBER}/$(ls ${DEPLOY_DIR_IMAGE}/rpb-console-image-lava-${MACHINE0}-*-${BUILD_NUMBER}.rootfs.ext4.gz | xargs basename)
+SYSTEM_URL=http://builds.96boards.org/snapshots/reference-platform/openembedded/${MANIFEST_BRANCH}/${MACHINE0}/${DISTRO}/${BUILD_NUMBER}/$(ls ${DEPLOY_DIR_IMAGE}/rpb-console-image-lava-${MACHINE0}-*-${BUILD_NUMBER}.rootfs.ext4.gz | xargs basename)
 EOF