ci/lava: fix heredoc-in-yaml syntax
Fixes: 02d07f3380 ("ci/lava: Add SSH job definition")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36239>
This commit is contained in:
committed by
Marge Bot
parent
0cd745c386
commit
f4596e7828
@@ -30,7 +30,7 @@ variables:
|
||||
|
||||
ALPINE_X86_64_BUILD_TAG: "20250722-libwayland"
|
||||
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"
|
||||
|
||||
|
||||
@@ -130,9 +130,10 @@ actions:
|
||||
-o ConnectTimeout=60 \
|
||||
root@$(lava-target-ip) "${@}"
|
||||
}
|
||||
- lava_ssh_test_case 'wait_for_dut_login' << EOF
|
||||
- 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
|
||||
- |-
|
||||
lava_ssh_test_case 'artifact_download' 'bash --' << EOF
|
||||
source /dut-env-vars.sh
|
||||
|
||||
@@ -101,9 +101,10 @@ actions:
|
||||
-o ConnectTimeout=60 \
|
||||
root@$(lava-target-ip) "${@}"
|
||||
}
|
||||
- lava_ssh_test_case 'wait_for_dut_login' << EOF
|
||||
- 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
|
||||
- |-
|
||||
lava_ssh_test_case 'artifact_download' 'bash --' << EOF
|
||||
source /dut-env-vars.sh
|
||||
|
||||
@@ -160,9 +160,13 @@ def generate_docker_test(
|
||||
|
||||
docker_commands += [
|
||||
to_yaml_block(DOCKER_COMMANDS, escape_vars=["LAVA_TARGET_IP"]),
|
||||
"lava_ssh_test_case 'wait_for_dut_login' << EOF",
|
||||
"while [ ! -e /dut_ready ]; do sleep 1; done;",
|
||||
"EOF",
|
||||
to_yaml_block(
|
||||
(
|
||||
"lava_ssh_test_case 'wait_for_dut_login' << EOF",
|
||||
"while [ ! -e /dut_ready ]; do sleep 1; done;",
|
||||
"EOF",
|
||||
)
|
||||
),
|
||||
to_yaml_block(
|
||||
(
|
||||
"lava_ssh_test_case 'artifact_download' 'bash --' << EOF",
|
||||
|
||||
Reference in New Issue
Block a user