Skip to content
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

ci: migrate to new directory and method names #1478

Merged
merged 1 commit into from
Oct 13, 2022
Merged

ci: migrate to new directory and method names #1478

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
14 changes: 7 additions & 7 deletions .cci.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,32 +31,32 @@ 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.")
//}

// 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()
}
}