Skip to content

Commit 6e09eb9

Browse files
committed
ci: fix URLs for qcom-distro images
File name for qcom-distro images start with qcom-multimedia-image. This patch fixes the broken names after adding jobs for qcom-distro. Signed-off-by: Milosz Wasilewski <[email protected]>
1 parent 1817c4a commit 6e09eb9

File tree

8 files changed

+17
-17
lines changed

8 files changed

+17
-17
lines changed

ci/lava/qcom-distro/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This happens for the following triggers:
1616
Job templates can use the following variables:
1717
- `DEVICE_TYPE`: name of the LAVA device type or alias. Full list can be found on [LAVA master web interface](https://lava.infra.foundries.io/scheduler/device_types)
1818
- `GITHUB_SHA`: Commit ID corresponding to the github action trigger
19-
- `BUILD_FILE_NAME`: Name of the build artifact to be downloaded. It's constructed as: `core-image-base-${DEVICE_TYPE}.rootfs.qcomflash.tar.gz`
19+
- `BUILD_FILE_NAME`: Name of the build artifact to be downloaded. It's constructed as: `qcom-multimedia-image-${DEVICE_TYPE}.rootfs.qcomflash.tar.gz`
2020
- `BUILD_DOWNLOAD_URL`: URL where the build artifacts can be found. This variable is constructed as: `${{inputs.url}}/${DEVICE_TYPE}/${BUILD_FILE_NAME}` where `{{inputs.url}}` comes from the build action.
2121
- `GITHUB_RUN_ID`: ID of the current Github run.
2222

ci/lava/qcom-distro/dragonboard-410c/boot.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ actions:
1111
rootfs:
1212
headers:
1313
Authentication: Q_GITHUB_TOKEN
14-
url: "{{BUILD_DOWNLOAD_URL}}/qcom-distro/qcom-armv8a/core-image-base-qcom-armv8a.rootfs.ext4.gz"
14+
url: "{{BUILD_DOWNLOAD_URL}}/qcom-distro/qcom-armv8a/qcom-multimedia-image-qcom-armv8a.rootfs.ext4.gz"
1515
compression: gz
1616
postprocess:
1717
docker:
1818
image: ghcr.io/foundriesio/lava-lmp-sign:main
1919
steps:
2020
- export IMAGE_PATH=$PWD
21-
- img2simg core-image-base-qcom-armv8a.rootfs.ext4 core-image-base-qcom-armv8a.rootfs.img
21+
- img2simg qcom-multimedia-image-qcom-armv8a.rootfs.ext4 qcom-multimedia-image-qcom-armv8a.rootfs.img
2222
- deploy:
2323
timeout:
2424
minutes: 15
@@ -27,7 +27,7 @@ actions:
2727
boot:
2828
url: downloads://boot-apq8016-sbc-qcom-armv8a.img
2929
rootfs:
30-
url: downloads://core-image-base-qcom-armv8a.rootfs.img
30+
url: downloads://qcom-multimedia-image-qcom-armv8a.rootfs.img
3131
apply-overlay: true
3232
- command:
3333
name: pre_power_command

ci/lava/qcom-distro/dragonboard-820c/boot.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ actions:
1111
rootfs:
1212
headers:
1313
Authentication: Q_GITHUB_TOKEN
14-
url: "{{BUILD_DOWNLOAD_URL}}/qcom-distro/qcom-armv8a/core-image-base-qcom-armv8a.rootfs.ext4.gz"
14+
url: "{{BUILD_DOWNLOAD_URL}}/qcom-distro/qcom-armv8a/qcom-multimedia-image-qcom-armv8a.rootfs.ext4.gz"
1515
compression: gz
1616
postprocess:
1717
docker:
1818
image: ghcr.io/foundriesio/lava-lmp-sign:main
1919
steps:
2020
- export IMAGE_PATH=$PWD
21-
- img2simg core-image-base-qcom-armv8a.rootfs.ext4 core-image-base-qcom-armv8a.rootfs.img
21+
- img2simg qcom-multimedia-image-qcom-armv8a.rootfs.ext4 qcom-multimedia-image-qcom-armv8a.rootfs.img
2222
- deploy:
2323
timeout:
2424
minutes: 15
@@ -27,7 +27,7 @@ actions:
2727
boot:
2828
url: downloads://boot-apq8096-db820c-qcom-armv8a.img
2929
rootfs:
30-
url: downloads://core-image-base-qcom-armv8a.rootfs.img
30+
url: downloads://qcom-multimedia-image-qcom-armv8a.rootfs.img
3131
apply-overlay: true
3232
- command:
3333
name: pre_power_command

ci/lava/qcom-distro/iq-9075-evk/boot.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ actions:
44
image:
55
headers:
66
Authentication: Q_GITHUB_TOKEN
7-
url: "{{BUILD_DOWNLOAD_URL}}/qcom-distro/{{DEVICE_TYPE}}/core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
7+
url: "{{BUILD_DOWNLOAD_URL}}/qcom-distro/{{DEVICE_TYPE}}/qcom-multimedia-image-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
88
postprocess:
99
docker:
1010
image: ghcr.io/foundriesio/lava-lmp-sign:main
@@ -21,7 +21,7 @@ actions:
2121
- deploy:
2222
images:
2323
image:
24-
url: downloads://core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz
24+
url: downloads://qcom-multimedia-image-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz
2525
settings:
2626
url: downloads://flash.settings
2727
overlay:

ci/lava/qcom-distro/qcs6490-rb3gen2-core-kit/boot.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ actions:
44
image:
55
headers:
66
Authentication: Q_GITHUB_TOKEN
7-
url: "{{BUILD_DOWNLOAD_URL}}/qcom-distro/{{DEVICE_TYPE}}/core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
7+
url: "{{BUILD_DOWNLOAD_URL}}/qcom-distro/{{DEVICE_TYPE}}/qcom-multimedia-image-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
88
postprocess:
99
docker:
1010
image: ghcr.io/foundriesio/lava-lmp-sign:main
@@ -21,7 +21,7 @@ actions:
2121
- deploy:
2222
images:
2323
image:
24-
url: downloads://core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz
24+
url: downloads://qcom-multimedia-image-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz
2525
settings:
2626
url: downloads://flash.settings
2727
overlay:

ci/lava/qcom-distro/qcs8300-ride-sx/boot.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ actions:
44
image:
55
headers:
66
Authentication: Q_GITHUB_TOKEN
7-
url: "{{BUILD_DOWNLOAD_URL}}/qcom-distro/{{DEVICE_TYPE}}/core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
7+
url: "{{BUILD_DOWNLOAD_URL}}/qcom-distro/{{DEVICE_TYPE}}/qcom-multimedia-image-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
88
postprocess:
99
docker:
1010
image: ghcr.io/foundriesio/lava-lmp-sign:main
@@ -21,7 +21,7 @@ actions:
2121
- deploy:
2222
images:
2323
image:
24-
url: downloads://core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz
24+
url: downloads://qcom-multimedia-image-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz
2525
settings:
2626
url: downloads://flash.settings
2727
overlay:

ci/lava/qcom-distro/qcs9100-ride-sx/boot.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ actions:
44
image:
55
headers:
66
Authentication: Q_GITHUB_TOKEN
7-
url: "{{BUILD_DOWNLOAD_URL}}/qcom-distro/{{DEVICE_TYPE}}/core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
7+
url: "{{BUILD_DOWNLOAD_URL}}/qcom-distro/{{DEVICE_TYPE}}/qcom-multimedia-image-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
88
postprocess:
99
docker:
1010
image: ghcr.io/foundriesio/lava-lmp-sign:main
@@ -21,7 +21,7 @@ actions:
2121
- deploy:
2222
images:
2323
image:
24-
url: downloads://core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz
24+
url: downloads://qcom-multimedia-image-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz
2525
settings:
2626
url: downloads://flash.settings
2727
overlay:

ci/lava/qcom-distro/qrb2210-rb1-core-kit/boot.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ actions:
44
image:
55
headers:
66
Authentication: Q_GITHUB_TOKEN
7-
url: "{{BUILD_DOWNLOAD_URL}}/qcom-distro/{{DEVICE_TYPE}}/core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
7+
url: "{{BUILD_DOWNLOAD_URL}}/qcom-distro/{{DEVICE_TYPE}}/qcom-multimedia-image-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
88
postprocess:
99
docker:
1010
image: ghcr.io/foundriesio/lava-lmp-sign:main
@@ -21,7 +21,7 @@ actions:
2121
- deploy:
2222
images:
2323
image:
24-
url: downloads://core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz
24+
url: downloads://qcom-multimedia-image-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz
2525
settings:
2626
url: downloads://flash.settings
2727
overlay:

0 commit comments

Comments
 (0)