lineage-rockchip/android_external_mesa3d
1
0
Fork 0
Code Activity Actions

ci/lava: fix heredoc-in-yaml syntax

Browse source 
Fixes: 02d07f3380 ("ci/lava: Add SSH job definition")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36239>
This commit is contained in:
Eric Engestrom 2025-07-18 11:52:34 +02:00 • committed by Marge Bot
parent 0cd745c386
commit f4596e7828
4 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci/image-tags.yml
View file

@ -30,7 +30,7 @@ variables:
ALPINE_X86_64_BUILD_TAG: "20250722-libwayland" ALPINE_X86_64_BUILD_TAG: "20250722-libwayland"
ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs" ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs"
ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250717-lava" ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250717-heredoc"
FEDORA_X86_64_BUILD_TAG: "20250722-libwayland" FEDORA_X86_64_BUILD_TAG: "20250722-libwayland"

7
.gitlab-ci/lava/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
View file

@ -130,9 +130,10 @@ actions:
-o ConnectTimeout=60 \ -o ConnectTimeout=60 \
root@$(lava-target-ip) "${@}" root@$(lava-target-ip) "${@}"
} }
- lava_ssh_test_case 'wait_for_dut_login' << EOF - |-
- while [ ! -e /dut_ready ]; do sleep 1; done; lava_ssh_test_case 'wait_for_dut_login' << EOF
- EOF while [ ! -e /dut_ready ]; do sleep 1; done;
EOF
- |- - |-
lava_ssh_test_case 'artifact_download' 'bash --' << EOF lava_ssh_test_case 'artifact_download' 'bash --' << EOF
source /dut-env-vars.sh source /dut-env-vars.sh

7
.gitlab-ci/lava/tests/data/UBOOT_force_uart=False_job_definition.yaml
View file

@ -101,9 +101,10 @@ actions:
-o ConnectTimeout=60 \ -o ConnectTimeout=60 \
root@$(lava-target-ip) "${@}" root@$(lava-target-ip) "${@}"
} }
- lava_ssh_test_case 'wait_for_dut_login' << EOF - |-
- while [ ! -e /dut_ready ]; do sleep 1; done; lava_ssh_test_case 'wait_for_dut_login' << EOF
- EOF while [ ! -e /dut_ready ]; do sleep 1; done;
EOF
- |- - |-
lava_ssh_test_case 'artifact_download' 'bash --' << EOF lava_ssh_test_case 'artifact_download' 'bash --' << EOF
source /dut-env-vars.sh source /dut-env-vars.sh

10
.gitlab-ci/lava/utils/ssh_job_definition.py
View file

@ -160,9 +160,13 @@ def generate_docker_test(
docker_commands += [ docker_commands += [
to_yaml_block(DOCKER_COMMANDS, escape_vars=["LAVA_TARGET_IP"]), to_yaml_block(DOCKER_COMMANDS, escape_vars=["LAVA_TARGET_IP"]),
"lava_ssh_test_case 'wait_for_dut_login' << EOF", to_yaml_block(
"while [ ! -e /dut_ready ]; do sleep 1; done;", (
"EOF", "lava_ssh_test_case 'wait_for_dut_login' << EOF",
"while [ ! -e /dut_ready ]; do sleep 1; done;",
"EOF",
)
),
to_yaml_block( to_yaml_block(
( (
"lava_ssh_test_case 'artifact_download' 'bash --' << EOF", "lava_ssh_test_case 'artifact_download' 'bash --' << EOF",