Skip to content

Change default cosa --strict parameter #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jlebon merged 1 commit into from
Dec 7, 2020
Merged

Change default cosa --strict parameter #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions vars/fcosBuild.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@
// extraArgs: string -- extra arguments to pass to `cosa build`
// cosaDir: string -- cosa working directory
// noForce: boolean -- don't force a cosa build even if nothing changed
// noStrict boolean -- do not run cosa using `--strict' option
def call(params = [:]) {
stage("Build FCOS") {
def cosaDir = utils.getCosaDir(params)
def extraFetchArgs = params.get('extraFetchArgs', "");
def extraArgs = params.get('extraArgs', "");

shwrap("mkdir -p ${cosaDir}")

if (!params['skipInit']) {
Expand All @@ -32,15 +36,16 @@ def call(params = [:]) {
shwrap("rsync -av ${it}/ ${cosaDir}/overrides/rootfs")
}
}

def extraFetchArgs = params.get('extraFetchArgs', "");
shwrap("cd ${cosaDir} && cosa fetch --strict ${extraFetchArgs}")

def extraArgs = params.get('extraArgs', "");
if (!params['noStrict']) {
extraFetchArgs = "--strict ${extraFetchArgs}"
extraArgs = "--strict ${extraArgs}"
}
if (!params['noForce']) {
extraArgs = "--force ${extraArgs}"
}
shwrap("cd ${cosaDir} && cosa build --strict ${extraArgs}")

shwrap("cd ${cosaDir} && cosa fetch ${extraFetchArgs}")
shwrap("cd ${cosaDir} && cosa build ${extraArgs}")
}

if (!params['skipKola']) {
Expand Down