From: Colin Walters Date: Tue, 31 May 2022 13:59:02 +0000 (-0400) Subject: ci: Drop libsoup build in jenkins X-Git-Tag: archive/raspbian/2022.4-1+rpi1^2~9^2^2~6^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2838f42eec5424cce3832b40f7ef73654b481e96;p=ostree.git ci: Drop libsoup build in jenkins GH actions is fast zero cost system that covers these build matrix things well. Let's keep our Fedora CI system doing more of the qemu heavy lifting. --- diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile index 9aab6feb..ff941249 100644 --- a/.cci.jenkinsfile +++ b/.cci.jenkinsfile @@ -38,8 +38,7 @@ stage("Build") { } // Build FCOS and do a kola basic run -stage("More builds and test") { -parallel fcos: { +stage("FCOS") { cosaPod(runAsUser: 0, memory: "3072Mi", cpu: "4") { stage("Build FCOS") { checkout scm @@ -74,19 +73,4 @@ parallel fcos: { } } } -}, -buildopts: { - def n = 5 - buildPod(memory: "2Gi", cpu: "${n}") { - checkout scm - shwrap(""" - git submodule update --init - - git worktree add build-libsoup && cd build-libsoup - env MAKE_JOBS=${n} CONFIGOPTS="--without-curl --without-openssl --with-soup" SKIP_INSTALLDEPS=1 ./ci/build.sh - make check - cd .. && rm -rf build-libsoup - """) - } -} }