[U-Boot] [PATCH 1/2] gitlab-ci: Remove unused TOOLCHAIN environment variable
As part of copying the logic from Travis to GitLab I kept the TOOLCHAIN variable. However we don't use that now as the Docker container already has all toolchains so we don't need to do any downloading. Remove this variable.
Signed-off-by: Tom Rini trini@konsulko.com --- .gitlab-ci.yml | 8 -------- 1 file changed, 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f59dc40f3e9c..37731746421d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -252,7 +252,6 @@ qemu_mips test.py: TEST_PY_BD: "qemu_mips" TEST_PY_TEST_SPEC: "not sleep" BUILDMAN: "^qemu_mips$" - TOOLCHAIN: "mips" <<: *buildman_and_testpy_dfn
qemu_mipsel test.py: @@ -261,7 +260,6 @@ qemu_mipsel test.py: TEST_PY_BD: "qemu_mipsel" TEST_PY_TEST_SPEC: "not sleep" BUILDMAN: "^qemu_mipsel$" - TOOLCHAIN: "mips" <<: *buildman_and_testpy_dfn
qemu_mips64 test.py: @@ -270,7 +268,6 @@ qemu_mips64 test.py: TEST_PY_BD: "qemu_mips64" TEST_PY_TEST_SPEC: "not sleep" BUILDMAN: "^qemu_mips64$" - TOOLCHAIN: "mips" <<: *buildman_and_testpy_dfn
qemu_mips64el test.py: @@ -279,7 +276,6 @@ qemu_mips64el test.py: TEST_PY_BD: "qemu_mips64el" TEST_PY_TEST_SPEC: "not sleep" BUILDMAN: "^qemu_mips64el$" - TOOLCHAIN: "mips" <<: *buildman_and_testpy_dfn
qemu-ppce500 test.py: @@ -288,7 +284,6 @@ qemu-ppce500 test.py: TEST_PY_BD: "qemu-ppce500" TEST_PY_TEST_SPEC: "not sleep" BUILDMAN: "^qemu-ppce500$" - TOOLCHAIN: "powerpc" <<: *buildman_and_testpy_dfn
qemu-x86 test.py: @@ -297,7 +292,6 @@ qemu-x86 test.py: TEST_PY_BD: "qemu-x86" TEST_PY_TEST_SPEC: "not sleep" BUILDMAN: "^qemu-x86$" - TOOLCHAIN: "i386" <<: *buildman_and_testpy_dfn
qemu-x86_64 test.py: @@ -306,7 +300,6 @@ qemu-x86_64 test.py: TEST_PY_BD: "qemu-x86_64" TEST_PY_TEST_SPEC: "not sleep" BUILDMAN: "^qemu-x86_64$" - TOOLCHAIN: "i386" <<: *buildman_and_testpy_dfn
zynq_zc702 test.py: @@ -334,5 +327,4 @@ xtfpga test.py: TEST_PY_TEST_SPEC: "not sleep" TEST_PY_ID: "--id qemu" BUILDMAN: "^xtfpga$" - TOOLCHAIN: "xtensa-dc233c-elf" <<: *buildman_and_testpy_dfn
Mirror the qemu-riscv64 testing we do on Travis. Update to a newer Docker image that contains riscv64-softmmu for QEMU.
Signed-off-by: Tom Rini trini@konsulko.com --- .gitlab-ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37731746421d..0759561ce9a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@
# Grab our configured image. The source for this is found at: # https://gitlab.denx.de/u-boot/gitlab-ci-runner -image: trini/u-boot-gitlab-ci-runner:xenial-20190720-29Jul2019 +image: trini/u-boot-gitlab-ci-runner:xenial-20190720-02Aug2019
# We run some tests in different order, to catch some failures quicker. stages: @@ -286,6 +286,14 @@ qemu-ppce500 test.py: BUILDMAN: "^qemu-ppce500$" <<: *buildman_and_testpy_dfn
+qemu-riscv64 test.py: + tags: [ 'all' ] + variables: + TEST_PY_BD: "qemu-riscv64" + TEST_PY_TEST_SPEC: "not sleep" + BUILDMAN: "^qemu-riscv64$" + <<: *buildman_and_testpy_dfn + qemu-x86 test.py: tags: [ 'all' ] variables:
On Sat, Aug 3, 2019 at 1:29 AM Tom Rini trini@konsulko.com wrote:
Mirror the qemu-riscv64 testing we do on Travis. Update to a newer Docker image that contains riscv64-softmmu for QEMU.
Signed-off-by: Tom Rini trini@konsulko.com
.gitlab-ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On Sat, Aug 03, 2019 at 05:58:47AM +0800, Bin Meng wrote:
On Sat, Aug 3, 2019 at 1:29 AM Tom Rini trini@konsulko.com wrote:
Mirror the qemu-riscv64 testing we do on Travis. Update to a newer Docker image that contains riscv64-softmmu for QEMU.
Signed-off-by: Tom Rini trini@konsulko.com
.gitlab-ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Pushed these, but forgot to applied-spam already, sorry. Thanks for looking!
On Fri, Aug 02, 2019 at 01:28:51PM -0400, Tom Rini wrote:
Mirror the qemu-riscv64 testing we do on Travis. Update to a newer Docker image that contains riscv64-softmmu for QEMU.
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
On Sat, Aug 3, 2019 at 1:29 AM Tom Rini trini@konsulko.com wrote:
As part of copying the logic from Travis to GitLab I kept the TOOLCHAIN variable. However we don't use that now as the Docker container already has all toolchains so we don't need to do any downloading. Remove this variable.
Signed-off-by: Tom Rini trini@konsulko.com
.gitlab-ci.yml | 8 -------- 1 file changed, 8 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On Fri, Aug 02, 2019 at 01:28:50PM -0400, Tom Rini wrote:
As part of copying the logic from Travis to GitLab I kept the TOOLCHAIN variable. However we don't use that now as the Docker container already has all toolchains so we don't need to do any downloading. Remove this variable.
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (2)
-
Bin Meng -
Tom Rini