From 3719f6934320a63329933a6a3a588e02c76b78f0 Mon Sep 17 00:00:00 2001 From: Renata Ravanelli Date: Fri, 30 Sep 2022 13:10:21 -0300 Subject: [PATCH] tree: drop FCOS wording from various places Signed-off-by: Renata Ravanelli --- vars/buildPod.groovy | 2 +- vars/cosaBuild.groovy | 6 +++--- vars/kola.groovy | 4 ++-- vars/utils.groovy | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vars/buildPod.groovy b/vars/buildPod.groovy index 52ddde9..3bc3452 100644 --- a/vars/buildPod.groovy +++ b/vars/buildPod.groovy @@ -1,4 +1,4 @@ -// buildPod is a thin wrapper around pod() which fills in the FCOS buildroot images. +// buildPod is a thin wrapper around pod() which fills in the CoreOS buildroot images. // Additional available parameters: // image: string // buildroot: bool diff --git a/vars/cosaBuild.groovy b/vars/cosaBuild.groovy index 30996e2..5f481ae 100644 --- a/vars/cosaBuild.groovy +++ b/vars/cosaBuild.groovy @@ -1,4 +1,4 @@ -// Build FCOS, possibly with modifications. +// Build CoreOS, possibly with modifications. // Available parameters: // cosaDir: string -- Cosa working directory // extraArgs: string -- Extra arguments to pass to `cosa build` @@ -12,7 +12,7 @@ // skipInit: boolean -- Assume `cosa init` has already been run // skipKola: boolean -- Do not automatically run kola on resulting build def call(params = [:]) { - stage("Build FCOS") { + stage("Build") { def cosaDir = utils.getCosaDir(params) def extraFetchArgs = params.get('extraFetchArgs', ""); def extraArgs = params.get('extraArgs', ""); @@ -54,7 +54,7 @@ def call(params = [:]) { } if (!params['skipKola']) { - fcosKola() + kola() } } diff --git a/vars/kola.groovy b/vars/kola.groovy index eb8bd4e..533f6f9 100644 --- a/vars/kola.groovy +++ b/vars/kola.groovy @@ -30,8 +30,8 @@ def call(params = [:]) { // Prevents multiple runs overwriting same filename in archiveArtifacts def token = shwrapCapture("uuidgen | cut -f1 -d-") - // Create a unique output directory for this run of fcosKola - def outputDir = shwrapCapture("mktemp -d ${cosaDir}/tmp/fcosKola-XXXXX") + // Create a unique output directory for this run of kola + def outputDir = shwrapCapture("mktemp -d ${cosaDir}/tmp/kola-XXXXX") // This is a bit obscure; what we're doing here is building a map of "name" // to "closure" which `parallel` will run in parallel. That way, we can diff --git a/vars/utils.groovy b/vars/utils.groovy index c57314d..dc6f4e9 100644 --- a/vars/utils.groovy +++ b/vars/utils.groovy @@ -17,7 +17,7 @@ def getCosaDir(params = [:]) { if (params['cosaDir']) { return params['cosaDir'] } else { - return "/srv/fcos" + return "/srv/coreos" } }