travis/gitlab/azure: Drop BUILDMAN variable with test.py
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 <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index d6c239a..ea04463 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -159,102 +159,78 @@
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_riscv32:
TEST_PY_BD: "qemu-riscv32"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-riscv32"
qemu_riscv64:
TEST_PY_BD: "qemu-riscv64"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-riscv64"
qemu_riscv32_spl:
TEST_PY_BD: "qemu-riscv32_spl"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-riscv32_spl"
qemu_riscv64_spl:
TEST_PY_BD: "qemu-riscv64_spl"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-riscv64_spl"
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"
xilinx_zynq_virt:
TEST_PY_BD: "xilinx_zynq_virt"
TEST_PY_ID: "--id qemu"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "xilinx_zynq_virt"
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
@@ -264,7 +240,6 @@
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
@@ -289,11 +264,11 @@
fi
# 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 8bc81dd..8a456c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,12 +38,12 @@
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
@@ -192,14 +192,12 @@
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
@@ -207,7 +205,6 @@
tags: [ 'all' ]
variables:
TEST_PY_BD: "sandbox_spl"
- BUILDMAN: "sandbox_spl"
TEST_PY_TEST_SPEC: "test_ofplatdata"
<<: *buildman_and_testpy_dfn
@@ -216,14 +213,12 @@
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:
@@ -231,7 +226,6 @@
variables:
TEST_PY_BD: "vexpress_ca15_tc2"
TEST_PY_ID: "--id qemu"
- BUILDMAN: "vexpress_ca15_tc2"
<<: *buildman_and_testpy_dfn
vexpress_ca9x4 test.py:
@@ -239,7 +233,6 @@
variables:
TEST_PY_BD: "vexpress_ca9x4"
TEST_PY_ID: "--id qemu"
- BUILDMAN: "vexpress_ca9x4"
<<: *buildman_and_testpy_dfn
integratorcp_cm926ejs test.py:
@@ -248,7 +241,6 @@
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:
@@ -256,7 +248,6 @@
variables:
TEST_PY_BD: "qemu_arm"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_arm"
<<: *buildman_and_testpy_dfn
qemu_arm64 test.py:
@@ -264,7 +255,6 @@
variables:
TEST_PY_BD: "qemu_arm64"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_arm64"
<<: *buildman_and_testpy_dfn
qemu_mips test.py:
@@ -272,7 +262,6 @@
variables:
TEST_PY_BD: "qemu_mips"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_mips"
<<: *buildman_and_testpy_dfn
qemu_mipsel test.py:
@@ -280,7 +269,6 @@
variables:
TEST_PY_BD: "qemu_mipsel"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_mipsel"
<<: *buildman_and_testpy_dfn
qemu_mips64 test.py:
@@ -288,7 +276,6 @@
variables:
TEST_PY_BD: "qemu_mips64"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_mips64"
<<: *buildman_and_testpy_dfn
qemu_mips64el test.py:
@@ -296,7 +283,6 @@
variables:
TEST_PY_BD: "qemu_mips64el"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu_mips64el"
<<: *buildman_and_testpy_dfn
qemu-ppce500 test.py:
@@ -304,7 +290,6 @@
variables:
TEST_PY_BD: "qemu-ppce500"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-ppce500"
<<: *buildman_and_testpy_dfn
qemu-riscv32 test.py:
@@ -312,7 +297,6 @@
variables:
TEST_PY_BD: "qemu-riscv32"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-riscv32"
<<: *buildman_and_testpy_dfn
qemu-riscv64 test.py:
@@ -320,7 +304,6 @@
variables:
TEST_PY_BD: "qemu-riscv64"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-riscv64"
<<: *buildman_and_testpy_dfn
qemu-riscv32_spl test.py:
@@ -328,7 +311,6 @@
variables:
TEST_PY_BD: "qemu-riscv32_spl"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-riscv32_spl"
<<: *buildman_and_testpy_dfn
qemu-riscv64_spl test.py:
@@ -336,7 +318,6 @@
variables:
TEST_PY_BD: "qemu-riscv64_spl"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-riscv64_spl"
<<: *buildman_and_testpy_dfn
qemu-x86 test.py:
@@ -344,7 +325,6 @@
variables:
TEST_PY_BD: "qemu-x86"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-x86"
<<: *buildman_and_testpy_dfn
qemu-x86_64 test.py:
@@ -352,7 +332,6 @@
variables:
TEST_PY_BD: "qemu-x86_64"
TEST_PY_TEST_SPEC: "not sleep"
- BUILDMAN: "qemu-x86_64"
<<: *buildman_and_testpy_dfn
xilinx_zynq_virt test.py:
@@ -361,7 +340,6 @@
TEST_PY_BD: "xilinx_zynq_virt"
TEST_PY_TEST_SPEC: "not sleep"
TEST_PY_ID: "--id qemu"
- BUILDMAN: "xilinx_zynq_virt"
<<: *buildman_and_testpy_dfn
xilinx_versal_virt test.py:
@@ -370,7 +348,6 @@
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:
@@ -379,5 +356,4 @@
TEST_PY_BD: "xtfpga"
TEST_PY_TEST_SPEC: "not sleep"
TEST_PY_ID: "--id qemu"
- BUILDMAN: "xtfpga"
<<: *buildman_and_testpy_dfn
diff --git a/.travis.yml b/.travis.yml
index 304d19c..f01983f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -207,7 +207,7 @@
# From buildman, exit code 129 means warnings only. If we've been asked to
# use clang only do one configuration.
# Build a selection of boards if TEST_PY_BD is empty
- - if [[ "${BUILDMAN}" != "" ]] && [[ "${TEST_PY_BD}" == "" ]]; then
+ - if [[ "${BUILDMAN}" != "" ]]; then
ret=0;
tools/buildman/buildman -P -E ${BUILDMAN} ${OVERRIDE}|| ret=$?;
if [[ $ret -ne 0 && $ret -ne 129 ]]; then
@@ -238,10 +238,10 @@
fi;
ret=0;
tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E
- --board ${BUILDMAN} ${OVERRIDE}|| ret=$?;
+ --board ${TEST_PY_BD} ${OVERRIDE}|| ret=$?;
if [[ $ret -ne 0 && $ret -ne 129 ]]; then
tools/buildman/buildman -sde -o ${UBOOT_TRAVIS_BUILD_DIR} -w
- --board ${BUILDMAN};
+ --board ${TEST_PY_BD};
exit $ret;
fi;
virtualenv -p /usr/bin/python3 /tmp/venv;
@@ -499,131 +499,111 @@
- name: "test/py sandbox"
env:
- TEST_PY_BD="sandbox"
- BUILDMAN="sandbox"
TOOLCHAIN="i386"
- name: "test/py sandbox with clang"
env:
- TEST_PY_BD="sandbox"
- BUILDMAN="sandbox"
OVERRIDE="-O clang-7"
- name: "test/py sandbox_spl"
env:
- TEST_PY_BD="sandbox_spl"
TEST_PY_TEST_SPEC="test_ofplatdata"
- BUILDMAN="sandbox"
TOOLCHAIN="i386"
TEST_PY_TOOLS="yes"
- name: "test/py sandbox_flattree"
env:
- TEST_PY_BD="sandbox_flattree"
- BUILDMAN="sandbox_flattree"
TOOLCHAIN="i386"
- name: "test/py evb-ast2500"
env:
- TEST_PY_BD="evb-ast2500"
TEST_PY_ID="--id qemu"
QEMU_TARGET="arm-softmmu"
- BUILDMAN="evb-ast2500"
- name: "test/py vexpress_ca15_tc2"
env:
- TEST_PY_BD="vexpress_ca15_tc2"
TEST_PY_ID="--id qemu"
QEMU_TARGET="arm-softmmu"
- BUILDMAN="vexpress_ca15_tc2"
- name: "test/py vexpress_ca9x4"
env:
- TEST_PY_BD="vexpress_ca9x4"
TEST_PY_ID="--id qemu"
QEMU_TARGET="arm-softmmu"
- BUILDMAN="vexpress_ca9x4"
- name: "test/py integratorcp_cm926ejs"
env:
- TEST_PY_BD="integratorcp_cm926ejs"
TEST_PY_TEST_SPEC="not sleep"
TEST_PY_ID="--id qemu"
QEMU_TARGET="arm-softmmu"
- BUILDMAN="integratorcp_cm926ejs"
- name: "test/py qemu_arm"
env:
- TEST_PY_BD="qemu_arm"
TEST_PY_TEST_SPEC="not sleep"
QEMU_TARGET="arm-softmmu"
- BUILDMAN="qemu_arm"
- name: "test/py qemu_arm64"
env:
- TEST_PY_BD="qemu_arm64"
TEST_PY_TEST_SPEC="not sleep"
QEMU_TARGET="aarch64-softmmu"
- BUILDMAN="qemu_arm64"
- name: "test/py qemu_mips"
env:
- TEST_PY_BD="qemu_mips"
TEST_PY_TEST_SPEC="not sleep"
QEMU_TARGET="mips-softmmu"
- BUILDMAN="qemu_mips"
TOOLCHAIN="mips"
- name: "test/py qemu_mipsel"
env:
- TEST_PY_BD="qemu_mipsel"
TEST_PY_TEST_SPEC="not sleep"
QEMU_TARGET="mipsel-softmmu"
- BUILDMAN="qemu_mipsel"
TOOLCHAIN="mips"
- name: "test/py qemu_mips64"
env:
- TEST_PY_BD="qemu_mips64"
TEST_PY_TEST_SPEC="not sleep"
QEMU_TARGET="mips64-softmmu"
- BUILDMAN="qemu_mips64"
TOOLCHAIN="mips"
- name: "test/py qemu_mips64el"
env:
- TEST_PY_BD="qemu_mips64el"
TEST_PY_TEST_SPEC="not sleep"
QEMU_TARGET="mips64el-softmmu"
- BUILDMAN="qemu_mips64el"
TOOLCHAIN="mips"
- name: "test/py qemu-ppce500"
env:
- TEST_PY_BD="qemu-ppce500"
TEST_PY_TEST_SPEC="not sleep"
QEMU_TARGET="ppc-softmmu"
- BUILDMAN="qemu-ppce500"
TOOLCHAIN="powerpc"
- name: "test/py qemu-riscv32"
env:
- TEST_PY_BD="qemu-riscv32"
TEST_PY_TEST_SPEC="not sleep"
QEMU_TARGET="riscv32-softmmu"
- BUILDMAN="qemu-riscv32"
TOOLCHAIN="riscv"
- name: "test/py qemu-riscv64"
env:
- TEST_PY_BD="qemu-riscv64"
TEST_PY_TEST_SPEC="not sleep"
QEMU_TARGET="riscv64-softmmu"
- BUILDMAN="qemu-riscv64"
TOOLCHAIN="riscv"
- name: "test/py qemu-riscv32_spl"
env:
- TEST_PY_BD="qemu-riscv32_spl"
TEST_PY_TEST_SPEC="not sleep"
QEMU_TARGET="riscv32-softmmu"
- BUILDMAN="qemu-riscv32_spl"
TOOLCHAIN="riscv"
- name: "test/py qemu-riscv64_spl"
env:
- TEST_PY_BD="qemu-riscv64_spl"
TEST_PY_TEST_SPEC="not sleep"
QEMU_TARGET="riscv64-softmmu"
- BUILDMAN="qemu-riscv64_spl"
TOOLCHAIN="riscv"
- name: "test/py qemu-x86"
env:
- TEST_PY_BD="qemu-x86"
TEST_PY_TEST_SPEC="not sleep"
QEMU_TARGET="i386-softmmu"
- BUILDMAN="qemu-x86"
TOOLCHAIN="i386"
BUILD_ROM="yes"
- name: "test/py qemu-x86_64"
@@ -631,7 +611,6 @@
- TEST_PY_BD="qemu-x86_64"
TEST_PY_TEST_SPEC="not sleep"
QEMU_TARGET="x86_64-softmmu"
- BUILDMAN="qemu-x86_64"
TOOLCHAIN="i386"
BUILD_ROM="yes"
- name: "test/py xilinx_zynq_virt"
@@ -640,21 +619,18 @@
TEST_PY_TEST_SPEC="not sleep"
QEMU_TARGET="arm-softmmu"
TEST_PY_ID="--id qemu"
- BUILDMAN="xilinx_zynq_virt"
- name: "test/py xilinx_versal_virt"
env:
- TEST_PY_BD="xilinx_versal_virt"
TEST_PY_TEST_SPEC="not sleep"
QEMU_TARGET="aarch64-softmmu"
TEST_PY_ID="--id qemu"
- BUILDMAN="xilinx_versal_virt"
- name: "test/py xtfpga"
env:
- TEST_PY_BD="xtfpga"
TEST_PY_TEST_SPEC="not sleep"
QEMU_TARGET="xtensa-softmmu"
TEST_PY_ID="--id qemu"
- BUILDMAN="xtfpga"
TOOLCHAIN="xtensa-dc233c-elf"
# TODO make it perfect ;-r