@@ -29,12 +29,12 @@ stages:
script:
# From buildman, exit code 129 means warnings only. If we've been asked to
# use clang only do one configuration.
- - if [[ "${BUILDMAN}" != "" ]]; then
+ - if [[ "${TEST_PY_BD}" != "" ]]; then
ret=0;
- tools/buildman/buildman -o /tmp -P -E --board ${BUILDMAN} ${OVERRIDE}
+ tools/buildman/buildman -o /tmp -P -E --board ${TEST_PY_BD} ${OVERRIDE}
|| ret=$?;
if [[ $ret -ne 0 && $ret -ne 129 ]]; then
- tools/buildman/buildman -o /tmp -sdeP --board ${BUILDMAN};
+ tools/buildman/buildman -o /tmp -sdeP --board ${TEST_PY_BD};
exit $ret;
fi;
fi
@@ -182,14 +182,12 @@ sandbox test.py:
tags: [ 'all' ]
variables:
TEST_PY_BD: "sandbox"
- BUILDMAN: "sandbox"
<<: *buildman_and_testpy_dfn
sandbox with clang test.py:
tags: [ 'all' ]
variables:
TEST_PY_BD: "sandbox"
- BUILDMAN: "sandbox"
OVERRIDE: "-O clang-7"
<<: *buildman_and_testpy_dfn
@@ -197,7 +195,6 @@ sandbox_spl test.py:
tags: [ 'all' ]
variables:
TEST_PY_BD: "sandbox_spl"
- BUILDMAN: "sandbox_spl"
TEST_PY_TEST_SPEC: "test_ofplatdata"
<<: *buildman_and_testpy_dfn
@@ -206,14 +203,12 @@ evb-ast2500 test.py:
variables:
TEST_PY_BD: "evb-ast2500"
TEST_PY_ID: "--id qemu"
- BUILDMAN: "evb-ast2500"
<<: *buildman_and_testpy_dfn
sandbox_flattree test.py:
tags: [ 'all' ]
variables:
TEST_PY_BD: "sandbox_flattree"
- BUILDMAN: "sandbox_flattree"
<<: *buildman_and_testpy_dfn
vexpress_ca15_tc2 test.py:
@@ -221,7 +216,6 @@ vexpress_ca15_tc2 test.py:
variables:
TEST_PY_BD: "vexpress_ca15_tc2"
TEST_PY_ID: "--id qemu"
- BUILDMAN: "vexpress_ca15_tc2"
<<: *buildman_and_testpy_dfn
vexpress_ca9x4 test.py:
@@ -229,7 +223,6 @@ vexpress_ca9x4 test.py:
variables:
TEST_PY_BD: "vexpress_ca9x4"
TEST_PY_ID: "--id qemu"
- BUILDMAN: "vexpress_ca9x4"
<<: *buildman_and_testpy_dfn
integratorcp_cm926ejs test.py:
@@ -238,7 +231,6 @@ integratorcp_cm926ejs test.py:
TEST_PY_BD: "integratorcp_cm926ejs"
TEST_PY_TEST_SPEC: "not sleep"
TEST_PY_ID: "--id qemu"
- BUILDMAN: "integratorcp_cm926ejs"
<<: *buildman_and_testpy_dfn
qemu_arm test.py:
@@ -246,7 +238,6 @@ qemu_arm test.py:
variables:
TEST_PY_BD: "qemu_arm"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_arm"
<<: *buildman_and_testpy_dfn
qemu_arm64 test.py:
@@ -254,7 +245,6 @@ qemu_arm64 test.py:
variables:
TEST_PY_BD: "qemu_arm64"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_arm64"
<<: *buildman_and_testpy_dfn
qemu_mips test.py:
@@ -262,7 +252,6 @@ qemu_mips test.py:
variables:
TEST_PY_BD: "qemu_mips"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_mips"
<<: *buildman_and_testpy_dfn
qemu_mipsel test.py:
@@ -270,7 +259,6 @@ qemu_mipsel test.py:
variables:
TEST_PY_BD: "qemu_mipsel"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_mipsel"
<<: *buildman_and_testpy_dfn
qemu_mips64 test.py:
@@ -278,7 +266,6 @@ qemu_mips64 test.py:
variables:
TEST_PY_BD: "qemu_mips64"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_mips64"
<<: *buildman_and_testpy_dfn
qemu_mips64el test.py:
@@ -286,7 +273,6 @@ qemu_mips64el test.py:
variables:
TEST_PY_BD: "qemu_mips64el"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_mips64el"
<<: *buildman_and_testpy_dfn
qemu-ppce500 test.py:
@@ -294,7 +280,6 @@ qemu-ppce500 test.py:
variables:
TEST_PY_BD: "qemu-ppce500"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-ppce500"
<<: *buildman_and_testpy_dfn
qemu-riscv64 test.py:
@@ -302,7 +287,6 @@ qemu-riscv64 test.py:
variables:
TEST_PY_BD: "qemu-riscv64"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-riscv64"
<<: *buildman_and_testpy_dfn
qemu-x86 test.py:
@@ -310,7 +294,6 @@ qemu-x86 test.py:
variables:
TEST_PY_BD: "qemu-x86"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-x86"
<<: *buildman_and_testpy_dfn
qemu-x86_64 test.py:
@@ -318,7 +301,6 @@ qemu-x86_64 test.py:
variables:
TEST_PY_BD: "qemu-x86_64"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-x86_64"
<<: *buildman_and_testpy_dfn
zynq_zc702 test.py:
@@ -327,7 +309,6 @@ zynq_zc702 test.py:
TEST_PY_BD: "zynq_zc702"
TEST_PY_TEST_SPEC: "not sleep"
TEST_PY_ID: "--id qemu"
- BUILDMAN: "zynq_zc702"
<<: *buildman_and_testpy_dfn
xilinx_versal_virt test.py:
@@ -336,7 +317,6 @@ xilinx_versal_virt test.py:
TEST_PY_BD: "xilinx_versal_virt"
TEST_PY_TEST_SPEC: "not sleep"
TEST_PY_ID: "--id qemu"
- BUILDMAN: "xilinx_versal_virt"
<<: *buildman_and_testpy_dfn
xtfpga test.py:
@@ -345,5 +325,4 @@ xtfpga test.py:
TEST_PY_BD: "xtfpga"
TEST_PY_TEST_SPEC: "not sleep"
TEST_PY_ID: "--id qemu"
- BUILDMAN: "xtfpga"
<<: *buildman_and_testpy_dfn
This is not needed now since we use the same name as the pytests. Signed-off-by: Simon Glass <sjg at chromium.org> --- .gitlab-ci.yml | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-)