This is not needed in the test.py part of the config, now since we use the
same name as the pytests.
Drop BUILDMAN, retaining it only for the 'build' parts of the config, i.e.
where we build multiple boards and don't run any tests.
Signed-off-by: Simon Glass
---
Changes in v3: None
Changes in v2:
- Update travis, azure also
.azure-pipelines.yml | 28 +++-
.gitlab-ci.yml | 27 +++
.travis.yml | 27 +++
3 files changed, 9 insertions(+), 73 deletions(-)
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 8092545642..3d5b12ba3e 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -158,90 +158,69 @@ jobs:
matrix:
sandbox:
TEST_PY_BD: "sandbox"
- BUILDMAN: "sandbox"
sandbox_clang:
TEST_PY_BD: "sandbox"
- BUILDMAN: "sandbox"
OVERRIDE: "-O clang-7"
sandbox_spl:
TEST_PY_BD: "sandbox_spl"
TEST_PY_TEST_SPEC: "test_ofplatdata"
- BUILDMAN: "sandbox_spl"
sandbox_flattree:
TEST_PY_BD: "sandbox_flattree"
- BUILDMAN: "sandbox_flattree"
evb_ast2500:
TEST_PY_BD: "evb-ast2500"
TEST_PY_ID: "--id qemu"
- BUILDMAN: "evb-ast2500"
vexpress_ca15_tc2:
TEST_PY_BD: "vexpress_ca15_tc2"
TEST_PY_ID: "--id qemu"
- BUILDMAN: "vexpress_ca15_tc2"
vexpress_ca9x4:
TEST_PY_BD: "vexpress_ca9x4"
TEST_PY_ID: "--id qemu"
- BUILDMAN: "vexpress_ca9x4"
integratorcp_cm926ejs:
TEST_PY_BD: "integratorcp_cm926ejs"
TEST_PY_ID: "--id qemu"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "integratorcp_cm926ejs"
qemu_arm:
TEST_PY_BD: "qemu_arm"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_arm"
qemu_arm64:
TEST_PY_BD: "qemu_arm64"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_arm64"
qemu_mips:
TEST_PY_BD: "qemu_mips"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_mips"
qemu_mipsel:
TEST_PY_BD: "qemu_mipsel"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_mipsel"
qemu_mips64:
TEST_PY_BD: "qemu_mips64"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_mips64"
qemu_mips64el:
TEST_PY_BD: "qemu_mips64el"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_mips64el"
qemu_ppce500:
TEST_PY_BD: "qemu-ppce500"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-ppce500"
qemu_riscv64:
TEST_PY_BD: "qemu-riscv64"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-riscv64"
qemu_x86:
TEST_PY_BD: "qemu-x86"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-x86"
qemu_x86_64:
TEST_PY_BD: "qemu-x86_64"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-x86_64"
zynq_zc702:
TEST_PY_BD: "zynq_zc702"
TEST_PY_ID: "--id qemu"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "zynq_zc702"
xilinx_versal_virt:
TEST_PY_BD: "xilinx_versal_virt"
TEST_PY_ID: "--id qemu"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "xilinx_versal_virt"
xtfpga:
TEST_PY_BD: "xtfpga"
TEST_PY_ID: "--id qemu"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "xtfpga"
steps:
- script: |
cat << EOF > test.sh
@@ -251,7 +230,6 @@ jobs:
export TEST_PY_BD="${TEST_PY_BD}"
export TEST_PY_ID="${TEST_PY_ID}"
export TEST_PY_TEST_SPEC="${TEST_PY_TEST_SPEC}"
- export BUILDMAN="${BUILDMAN}"
export OVERRIDE="${OVERRIDE}"
EOF
cat << "EOF" >> test.sh
@@ -267,11 +245,11 @@ jobs:
cp /opt/grub/grubarm.efi ~/grub_arm.efi
# the below corresponds to .gitlab-ci.yml "script"
cd ${WORK_DIR}
- if [[ "${BUILDMAN}" != "" ]]; then
+ if [[ "${TEST_PY_BD}" != "" ]]; then
ret=0;
- tools/buildman/buildman -o /tmp -P -E --board ${BUILDMAN}
${OVERRIDE} || ret=$?;
+ 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
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f48cad752..2cd6209222 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,12 +29,12 @@ stages:
script:
# From buildman, exit code 129
