From 0f2f110679e56b61f6dab296473c80a874bf63b8 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 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
index d3aa7fc49..9660e6f94 100644
--- a/.cci.jenkinsfile
+++ b/.cci.jenkinsfile
@@ -31,13 +31,13 @@ cosaPod {
     checkout scm
 
     unstash name: 'build'
-    fcosBuild(skipKola: true, overlays: ["install"])
+    cosaBuild(skipKola: true, overlays: ["install"])
 
     // This is a temporary hack we use during spec stabilization to work around
     // external tests which use experimental versions. It should be commented
     // out in normal times.
-    //if (shwrapRc("grep -nr 3.3.0-experimental /srv/fcos/src/config/tests/kola") == 0) {
-    //    shwrap("find /srv/fcos/src/config/tests/kola -type f -exec sed -i 's/3.3.0-experimental/3.3.0/' {} \\;")
+    //if (shwrapRc("grep -nr 3.3.0-experimental /srv/coreos/src/config/tests/kola") == 0) {
+    //    shwrap("find /srv/coreos/src/config/tests/kola -type f -exec sed -i 's/3.3.0-experimental/3.3.0/' {} \\;")
     //} else {
     //    throw new Exception("No 3.3.0-experimental external tests found; comment out this workaround.")
     //}
@@ -45,18 +45,18 @@ cosaPod {
     // we run the blackbox tests separately instead of as part of the main kola
     // run since it's a distinct kind of test and we want to draw more
     // attention to it in the Jenkins UI
-    fcosKola(extraArgs: "--denylist-test ext.*.blackbox")
+    kola(extraArgs: "--denylist-test ext.*.blackbox")
 
     parallel blackbox: {
         unstash name: 'blackbox'
-        fcosKola(extraArgs: "ext.*.blackbox", skipUpgrade: true)
+        kola(extraArgs: "ext.*.blackbox", skipUpgrade: true)
     }, testiso: {
         shwrap("""
-            cd /srv/fcos
+            cd /srv/coreos
             cosa buildextend-metal
             cosa buildextend-metal4k
             cosa buildextend-live --fast
         """)
-        fcosKolaTestIso(cosaDir: "/srv/fcos")
+        kolaTestIso()
     }
 }