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

Jump to bottom

Clean up 1.17 and 1.18 build filters #914

Merged
merged 1 commit into from Jan 17, 2019
Merged

Clean up 1.17 and 1.18 build filters #914

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...s/jenkins_job_builder/files/theforeman.org/yaml/jobs/packaging_build_deb_coreproject.yaml
View file
Open in desktop
Expand Up @@ -20,15 +20,14 @@
name: arch
values:
- x86
- armv7
- armv8
- axis:
type: slave
name: label
values:
- debian
execution-strategy:
combination-filter: '((onlyarch == "all") || onlyarch == arch) && ((onlyos == "all") || onlyos == os) && !(version != 1.17 && arch == "armv7") && !((version == "1.17" || version == "1.18") && os == "bionic")'
combination-filter: '((onlyarch == "all") || onlyarch == arch) && ((onlyos == "all") || onlyos == os)'
builders:
- build_deb_coreproject
publishers:
Expand Down Expand Up @@ -59,7 +58,6 @@ Any value other than "theforeman" will be pushed to http://stagingdeb.theforeman
choices:
- all
- x86
- armv7
- armv8
description: 'Restrict matrix job to just the one arch.'
- string:
Expand Down
1 change: 0 additions & 1 deletion ...es/jenkins_job_builder/files/theforeman.org/yaml/jobs/packaging_build_deb_dependency.yaml
View file
Open in desktop
Expand Up @@ -23,7 +23,6 @@
name: arch
values:
- x86
- armv7
- armv8
- axis:
type: slave
Expand Down
2 changes: 0 additions & 2 deletions puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/release_push_deb.yaml
View file
Open in desktop
Expand Up @@ -19,5 +19,3 @@
- stretch
- xenial
- bionic
execution-strategy:
combination-filter: '!(os == "bionic" && (major_version == "1.17" || major_version == "1.18"))'
2 changes: 0 additions & 2 deletions puppet/modules/jenkins_job_builder/files/theforeman.org/yaml/jobs/release_test.yaml
View file
Open in desktop
Expand Up @@ -34,8 +34,6 @@
name: label
values:
- el&&ipv6
execution-strategy:
combination-filter: '!(os == "ubuntu1804" && (major_version == "1.17" || major_version == "1.18"))'
wrappers:
- abort_build:
timeout_min: 120
Expand Down