OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Move ARM rootfses to stable

Browse Source 
We build in Debian buster but were currently testing in bullseye-based
ramdisks. This has started being a problem since Python 3.7 was removed
from bullseye.

[ Also bumped arm_test containers, by anholt ]

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5433>
This commit is contained in:
Tomeu Vizoso
2020-06-15 13:29:22 +02:00
committed by Marge Bot
parent a04672a105
commit 21b2dac793
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@@ -272,7 +272,7 @@ arm_build:
- .fdo.container-build@debian@arm64v8 - .fdo.container-build@debian@arm64v8
- .container - .container
variables: variables:
FDO_DISTRIBUTION_TAG: &arm_build "2020-06-12" FDO_DISTRIBUTION_TAG: &arm_build "2020-06-22-stable"
.use-arm_build: .use-arm_build:
variables: variables:
@@ -287,7 +287,7 @@ arm_test-base:
- .fdo.container-build@debian - .fdo.container-build@debian
- .container - .container
variables: variables:
FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-09-rsync" FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-22-stable"
.use-arm_test-base: .use-arm_test-base:
extends: extends:
@@ -305,7 +305,7 @@ arm64_test:
extends: extends:
- .use-arm_test-base - .use-arm_test-base
variables: variables:
FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-18-vkcts" FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-22-stable"
.use-arm64_test: .use-arm64_test:
variables: variables:

2
.gitlab-ci/container/lava_arm.sh
View File

@@ -78,7 +78,7 @@ debootstrap \
--variant=minbase \ --variant=minbase \
--arch=${DEBIAN_ARCH} \ --arch=${DEBIAN_ARCH} \
--components main,contrib,non-free \ --components main,contrib,non-free \
testing \ buster \
/lava-files/rootfs-${DEBIAN_ARCH}/ \ /lava-files/rootfs-${DEBIAN_ARCH}/ \
http://deb.debian.org/debian http://deb.debian.org/debian