These deprecated builds will be disabled. Remove testing of armhf, i686, and wasm32.
Signed-off-by: Richard Henderson <[email protected]> --- .gitlab-ci.d/buildtest-template.yml | 27 ----------------- .gitlab-ci.d/buildtest.yml | 9 ------ .gitlab-ci.d/container-cross.yml | 17 ----------- .gitlab-ci.d/containers.yml | 3 -- .gitlab-ci.d/crossbuilds.yml | 45 ----------------------------- 5 files changed, 101 deletions(-) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index d866cb12bb..9c2ae39ddd 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -123,30 +123,3 @@ - du -chs ${CI_PROJECT_DIR}/*-cache variables: QEMU_JOB_FUNCTIONAL: 1 - -.wasm_build_job_template: - extends: .base_job_template - stage: build - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG - before_script: - - source scripts/ci/gitlab-ci-section - - section_start setup "Pre-script setup" - - JOBS=$(expr $(nproc) + 1) - - section_end setup - script: - - du -sh .git - - mkdir build - - cd build - - section_start configure "Running configure" - - emconfigure ../configure --disable-docs - ${TARGETS:+--target-list="$TARGETS"} - $CONFIGURE_ARGS || - { cat config.log meson-logs/meson-log.txt && exit 1; } - - if test -n "$LD_JOBS"; - then - pyvenv/bin/meson configure . -Dbackend_max_links="$LD_JOBS" ; - fi || exit 1; - - section_end configure - - section_start build "Building QEMU" - - emmake make -j"$JOBS" - - section_end build diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index dfe954fe3c..1d4b8a030a 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -784,12 +784,3 @@ coverity: when: never # Always manual on forks even if $QEMU_CI == "2" - when: manual - -build-wasm: - extends: .wasm_build_job_template - timeout: 2h - needs: - - job: wasm-emsdk-cross-container - variables: - IMAGE: emsdk-wasm32-cross - CONFIGURE_ARGS: --static --disable-tools --enable-debug --enable-tcg-interpreter diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 0fd7341afa..044795d9ff 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -22,12 +22,6 @@ arm64-debian-cross-container: variables: NAME: debian-arm64-cross -armhf-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-armhf-cross - hexagon-cross-container: extends: .container_job_template stage: containers @@ -40,12 +34,6 @@ loongarch-debian-cross-container: variables: NAME: debian-loongarch-cross -i686-debian-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-i686-cross - mips64el-debian-cross-container: extends: .container_job_template stage: containers @@ -85,8 +73,3 @@ win64-fedora-cross-container: extends: .container_job_template variables: NAME: fedora-win64-cross - -wasm-emsdk-cross-container: - extends: .container_job_template - variables: - NAME: emsdk-wasm32-cross diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index f7d3e7205d..222522ca16 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -47,10 +47,8 @@ weekly-container-builds: - amd64-debian-user-cross-container - amd64-debian-legacy-cross-container - arm64-debian-cross-container - - armhf-debian-cross-container - hexagon-cross-container - loongarch-debian-cross-container - - i686-debian-cross-container - mips64el-debian-cross-container - ppc64el-debian-cross-container - riscv64-debian-cross-container @@ -58,7 +56,6 @@ weekly-container-builds: - tricore-debian-cross-container - xtensa-debian-cross-container - win64-fedora-cross-container - - wasm-emsdk-cross-container # containers - amd64-alpine-container - amd64-debian-container diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 99dfa7eea6..59ff8b1d87 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -1,13 +1,6 @@ include: - local: '/.gitlab-ci.d/crossbuild-template.yml' -cross-armhf-user: - extends: .cross_user_build_job - needs: - - job: armhf-debian-cross-container - variables: - IMAGE: debian-armhf-cross - cross-arm64-system: extends: .cross_system_build_job needs: @@ -30,44 +23,6 @@ cross-arm64-kvm-only: IMAGE: debian-arm64-cross EXTRA_CONFIGURE_OPTS: --disable-tcg --without-default-features -cross-i686-system: - extends: - - .cross_system_build_job - - .cross_test_artifacts - needs: - - job: i686-debian-cross-container - variables: - IMAGE: debian-i686-cross - EXTRA_CONFIGURE_OPTS: --disable-kvm - MAKE_CHECK_ARGS: check-qtest - -cross-i686-user: - extends: - - .cross_user_build_job - - .cross_test_artifacts - needs: - - job: i686-debian-cross-container - variables: - IMAGE: debian-i686-cross - MAKE_CHECK_ARGS: check - -cross-i686-tci: - extends: - - .cross_accel_build_job - - .cross_test_artifacts - timeout: 60m - needs: - - job: i686-debian-cross-container - variables: - IMAGE: debian-i686-cross - ACCEL: tcg-interpreter - EXTRA_CONFIGURE_OPTS: --target-list=i386-softmmu,i386-linux-user,arm-softmmu,arm-linux-user,ppc-softmmu,ppc-linux-user --disable-plugins --disable-kvm - # Force tests to run with reduced parallelism, to see whether this - # reduces the flakiness of this CI job. The CI - # environment by default shows us 8 CPUs and so we - # would otherwise be using a parallelism of 9. - MAKE_CHECK_ARGS: check check-tcg -j2 - cross-mips64el-system: extends: .cross_system_build_job needs: -- 2.43.0
