From 405d59f175da4fa1f953c0e12bed01a8cd3220c1 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 7 Sep 2023 14:31:47 -0400 Subject: [PATCH] ci/jenkins: `Drop runAsUser: 0` This provokes a virtiofs bug: https://gitlab.com/virtio-fs/virtiofsd/-/merge_requests/197 xref https://github.com/coreos/coreos-assembler/pull/3428#issuecomment-1710606914 --- .cci.jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile index 305f12a5cc..78f85dedee 100644 --- a/.cci.jenkinsfile +++ b/.cci.jenkinsfile @@ -26,14 +26,14 @@ codestyle: { def nhosts = 4 def mem = (nhosts * 1536) + 512 -cosaPod(runAsUser: 0, memory: "${mem}Mi", cpu: "${nhosts}") { +cosaPod(memory: "${mem}Mi", cpu: "${nhosts}") { stage("Unit Tests") { checkout scm unstash 'rpms' // run this stage first without installing deps, so we match exactly the cosa pkgset // (+ our built rpm-ostree) shwrap(""" - dnf install -y *.rpm + sudo dnf install -y *.rpm # Cross check we enabled the unit tests rpm-ostree --version | grep bin-unit-tests rpm-ostree testutils c-units @@ -51,11 +51,11 @@ cosaPod(runAsUser: 0, memory: "${mem}Mi", cpu: "${nhosts}") { """) } stage("Install Deps") { - shwrap("ci/install-test-deps.sh") + shwrap("sudo ci/install-test-deps.sh") } stage("Kola") { // TODO upstream this into coreos-ci-lib - shwrap("make -C tests/kolainst install") + shwrap("sudo make -C tests/kolainst install") kola(cosaDir: "${env.WORKSPACE}", extraArgs: "ext.rpm-ostree.*", parallel: nhosts) } stage("vmcheck") {