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.

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

vars/kola: Add support for skipping a list of kola tags #159

Merged
merged 1 commit into from
Jun 21, 2024

Conversation

marmijo
Copy link
Contributor

@marmijo marmijo commented Jun 21, 2024

Introduce a kola parameter to allow skipping a list of kola tags. This is particularly useful when adding new streams to the pipeline.

xref: coreos/fedora-coreos-pipeline#1008

See: coreos/fedora-coreos-pipeline#1002

marmijo added a commit to marmijo/fedora-coreos-pipeline that referenced this pull request Jun 21, 2024
Kola can now support skipping kola tags per stream[1]. Add support
for that here by modifying each Jenkins job to pass the list of
kola tags to skip to the kola function.

[1]: coreos/coreos-ci-lib#159

See: coreos#1002
marmijo added a commit to marmijo/fedora-coreos-pipeline that referenced this pull request Jun 21, 2024
Kola can now support skipping kola tags per stream[1]. Add support
for that here by modifying each Jenkins job to pass the list of
kola tags to skip to the kola function.

[1]: coreos/coreos-ci-lib#159

See: coreos#1002
Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for working on this!

vars/kola.groovy Outdated
@@ -102,6 +103,13 @@ def call(params = [:]) {
args += " --exttest=${env.WORKSPACE}/${path}"
}

def skipKolaTags = params.get('skipKolaTags', "")
def skipKolaTagsArgs = ""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about instead of this new variable, we just keep modifying args like we do for other directives?

Copy link
Contributor Author

@marmijo marmijo Jun 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had thought about that, but args isnt passed to all of the kola() runs. Now that we aren't passing this to all of them, I'll simplify it and just append to args 👍

vars/kola.groovy Outdated
def skipKolaTagsArgs = ""

for (tag in skipKolaTags) {
skipKolaTagsArgs += "--tag=!${tag} "
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So then, this would be

Suggested change
skipKolaTagsArgs += "--tag=!${tag} "
args += " --tag=!${tag}"

vars/kola.groovy Outdated
@@ -157,7 +165,7 @@ def call(params = [:]) {
def id = marker == "" ? "kola-upgrade" : "kola-upgrade-${marker}"
ids += id
try {
runKola(id, 'run-upgrade', "--upgrades")
runKola(id, 'run-upgrade', "--upgrades ${skipKolaTagsArgs}")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think let's keep out upgrade tests from this for now. It currently doesn't run for RHCOS and those tests should instead be converted into regular kola tests (see also discussions in coreos/coreos-assembler#3714).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do, I wasnt sure if this would be required for the upgrade tests. I'll remove it.

marmijo added a commit to marmijo/fedora-coreos-pipeline that referenced this pull request Jun 21, 2024
Kola can now support skipping kola tags per stream[1]. Add support
for that here by modifying each Jenkins job to pass the list of
kola tags to skip to the kola function.

[1]: coreos/coreos-ci-lib#159

See: coreos#1002
marmijo added a commit to marmijo/fedora-coreos-pipeline that referenced this pull request Jun 21, 2024
Kola can now support skipping kola tags per stream[1]. Add support
for that here by modifying each Jenkins job to pass the list of
kola tags to skip to the kola function.

[1]: coreos/coreos-ci-lib#159

See: coreos#1002
vars/kola.groovy Outdated Show resolved Hide resolved
vars/kola.groovy Show resolved Hide resolved
Introduce a kola parameter to allow skipping a list of kola tags.
This is particularly useful when adding new streams to the pipeline.

xref: coreos/fedora-coreos-pipeline#1008

Reference: coreos/fedora-coreos-pipeline#1002
Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thanks!

@jlebon jlebon merged commit 954e002 into coreos:main Jun 21, 2024
jlebon pushed a commit to coreos/fedora-coreos-pipeline that referenced this pull request Jun 21, 2024
Kola can now support skipping kola tags per stream[1]. Add support
for that here by modifying each Jenkins job to pass the list of
kola tags to skip to the kola function.

[1]: coreos/coreos-ci-lib#159

See: #1002
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants