From 2838f42eec5424cce3832b40f7ef73654b481e96 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 31 May 2022 09:59:02 -0400 Subject: [PATCH] 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. --- .cci.jenkinsfile | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) 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 - """) - } -} }