From c24f26e577bf290b58d2ecd7a36d8b3a31057321 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 23 Apr 2020 11:26:56 -0400 Subject: [PATCH] ci: fix building metal image We were doing `cosa build metal` instead of `cosa buildextend-metal`. And since `fcosBuild` itself already builds a qemu image, we were essentially doing `create_disk.sh` twice. Fix that by using `buildextend-metal`, and just making the initial `fcosBuild` only build the OSTree since we don't need the QEMU image for our tests. And also skip the regular kola tests since those don't really test coreos-installer anyway (and they'd need the QEMU image). --- .cci.jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile index 7f27f5c0d..dfea6297f 100644 --- a/.cci.jenkinsfile +++ b/.cci.jenkinsfile @@ -3,10 +3,11 @@ cosaPod(buildroot: true) { checkout scm - fcosBuild(make: true) + // we don't need the qemu image to test coreos-installer; just the OSTree + fcosBuild(make: true, skipKola: true, extraArgs: 'ostree') stage("Build metal+live") { - shwrap("cd /srv/fcos && cosa build metal") + shwrap("cd /srv/fcos && cosa buildextend-metal") shwrap("cd /srv/fcos && cosa buildextend-metal4k") // Compress once shwrap("cd /srv/fcos && cosa buildextend-live")