Skip to content

Commit

Permalink
tree: drop FCOS wording from various places
Browse files Browse the repository at this point in the history
Signed-off-by: Renata Ravanelli <rravanel@redhat.com>
  • Loading branch information
ravanelli authored and jlebon committed Oct 12, 2022
1 parent cb7cda3 commit 3719f69
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion vars/buildPod.groovy
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions vars/cosaBuild.groovy
Original file line number Diff line number Diff line change
@@ -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`
Expand All @@ -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', "");
Expand Down Expand Up @@ -54,7 +54,7 @@ def call(params = [:]) {
}

if (!params['skipKola']) {
fcosKola()
kola()
}
}

4 changes: 2 additions & 2 deletions vars/kola.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion vars/utils.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def getCosaDir(params = [:]) {
if (params['cosaDir']) {
return params['cosaDir']
} else {
return "/srv/fcos"
return "/srv/coreos"
}
}

Expand Down

0 comments on commit 3719f69

Please sign in to comment.