From 2423ee1c46974ce60414378ffac4362f67e955b2 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Thu, 13 Oct 2022 14:08:56 -0400
Subject: [PATCH] ci: migrate to new directory and method names

The previous `fcos*` ones are deprecated.
See: https://github.com/coreos/coreos-ci-lib/pull/122
---
 .cci.jenkinsfile | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
index 1ac5a9164..a642ee5a1 100644
--- a/.cci.jenkinsfile
+++ b/.cci.jenkinsfile
@@ -17,31 +17,31 @@ cosaPod(buildroot: true, runAsUser: 0) {
     // Make sure cosa is using the binary we just built.
     shwrap("rsync -rlv install/usr/ /usr/")
 
-    fcosBuild(skipKola: true, overlays: ["install"])
+    cosaBuild(skipKola: true, overlays: ["install"])
     // Skipping kdump.crash due to CI failure in coreos-installer repo
     // https://github.com/coreos/fedora-coreos-tracker/issues/1075
-    fcosKola(extraArgs: "--denylist-test ext.config.kdump.crash")
+    kola(extraArgs: "--denylist-test ext.config.kdump.crash")
 
     stage("Build metal+live") {
-        shwrap("cd /srv/fcos && cosa buildextend-metal")
-        shwrap("cd /srv/fcos && cosa buildextend-metal4k")
-        shwrap("cd /srv/fcos && cosa buildextend-live --fast")
-        // Test metal with an uncompressed image and metal4k with a
-        // compressed one
-        shwrap("cd /srv/fcos && cosa compress --fast --artifact=metal4k")
+        dir("/srv/coreos") {
+            shwrap("cosa buildextend-metal")
+            shwrap("cosa buildextend-metal4k")
+            shwrap("cosa buildextend-live --fast")
+            // Test metal with an uncompressed image and metal4k with a
+            // compressed one
+            shwrap("cosa compress --fast --artifact=metal4k")
+        }
     }
     stage("Test ISO") {
         // No need to run the iso-live-login/iso-as-disk scenarios
-        fcosKolaTestIso(
-            cosaDir: "/srv/fcos",
+        kolaTestIso(
             scenarios: "pxe-install,pxe-offline-install,iso-install,iso-offline-install,miniso-install",
             scenarios4k: "iso-install,iso-offline-install",
             skipUEFI: true
         )
         // Only test ISO because kola testiso doesn't support NM keyfiles
         // for PXE
-        fcosKolaTestIso(
-            cosaDir: "/srv/fcos",
+        kolaTestIso(
             scenarios: "iso-install",
             extraArgs: "--add-nm-keyfile",
             skipMetal4k: true,
@@ -50,6 +50,6 @@ cosaPod(buildroot: true, runAsUser: 0) {
         )
     }
     stage("Image tests") {
-        shwrap("tests/images.sh /srv/fcos/builds/latest/x86_64")
+        shwrap("tests/images.sh /srv/coreos/builds/latest/x86_64")
     }
 }