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

fix 3.9 jenkins job definitions #385

Merged
merged 1 commit into from
Nov 29, 2023
Merged

fix 3.9 jenkins job definitions #385

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions centos.org/jobs/katello-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
version:
- '4.9'
- '4.10'
- '4.11'
Copy link
Member

Choose a reason for hiding this comment

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

This should be covered:

jenkins-jobs/branch-foreman

Line 20 in b993393

sed -i "/nightly/i \ \ \ \ \ \ - '${KATELLO_VERSION}'" centos.org/jobs/katello-pipelines.yml

- 'nightly'
type:
- katello
Expand Down
8 changes: 4 additions & 4 deletions theforeman.org/pipelines/test/foreman/vars.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ def foreman_integration_versions = [
'katello': 'master'
],
'3.9-stable': [
'ruby': ['2.7'],
'katello': 'KATELLO-4.11'
'ruby': ['2.7'],
'katello': 'KATELLO-4.11'
],
'3.8-stable': [
'ruby': ['2.7'],
Expand Down Expand Up @@ -46,8 +46,8 @@ def foreman_unit_versions = [
'ruby': ['2.7']
],
'3.9-stable': [
'ruby': ['2.7'],
'katello': 'KATELLO-4.11'
'ruby': ['2.7'],
'katello': 'KATELLO-4.11'
],
'3.8-stable': [
'ruby': ['2.7'],
Expand Down
4 changes: 2 additions & 2 deletions theforeman.org/pipelines/test/testKatello.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ def katello_versions = [
'ruby': ['2.7']
],
'KATELLO-4.11': [
'foreman': '3.9-stable',
'ruby': ['2.7']
'foreman': '3.9-stable',
'ruby': ['2.7']
],
'KATELLO-4.10': [
'foreman': '3.8-stable',
Expand Down
5 changes: 2 additions & 3 deletions theforeman.org/pipelines/vars/foreman/3.9.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
def foreman_version = '3.9'
def git_branch = "${foreman_version}-stable"
def stage_source = 'copr'
def stage_source = 'stagingyum'
Copy link
Member

Choose a reason for hiding this comment

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

It should have copied this from nightly:

jenkins-jobs/branch-foreman

Lines 11 to 12 in b993393

sed "/foreman_version/ s/nightly/${FOREMAN_VERSION}/ ; /git_branch/ s/develop/\${foreman_version}-stable/" \
theforeman.org/pipelines/vars/foreman/nightly.groovy > theforeman.org/pipelines/vars/foreman/${FOREMAN_VERSION}.groovy

And nightly has stagingyum:

jenkins-jobs/theforeman.org/pipelines/vars/foreman/nightly.groovy

Line 3 in b993393

def stage_source = 'stagingyum'


def foreman_client_distros = [
'el9',
'el8',
'el7',
'sles12'
Copy link
Member

Choose a reason for hiding this comment

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

I didn't realize we'd effectively drop sles12 this way. I wonder if we could somehow restore this at some point, like syncing from OBS.

Copy link
Member Author

Choose a reason for hiding this comment

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

copr can build for sles, so we could… just build it, properly.

Copy link
Member

Choose a reason for hiding this comment

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

It's not listed in nightly, which is the source for this:

jenkins-jobs/theforeman.org/pipelines/vars/foreman/nightly.groovy

Lines 5 to 9 in b993393

def foreman_client_distros = [
'el9',
'el8',
'el7'
]

'el7'
]
def foreman_el_releases = [
'el8'
Expand Down
2 changes: 1 addition & 1 deletion theforeman.org/pipelines/vars/katello/4.11.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
def foreman_version = '3.9'
def katello_version = '4.11'
def stage_source = 'copr'
def stage_source = 'stagingyum'
def foreman_el_releases = [
'el8'
]
Expand Down
2 changes: 1 addition & 1 deletion theforeman.org/yaml/includes/foreman_versions_copr.yaml.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[]
- '3.9'
Copy link
Member

Choose a reason for hiding this comment

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

I'd have expected this line to add this:

jenkins-jobs/branch-foreman

Line 24 in b993393

echo "- '${FOREMAN_VERSION}'" >> theforeman.org/yaml/includes/foreman_versions_copr.yaml.inc

1 change: 1 addition & 0 deletions theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@
version:
- '4.9'
- '4.10'
- '4.11'
Copy link
Member

Choose a reason for hiding this comment

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

This should be covered:

jenkins-jobs/branch-foreman

Line 26 in b993393

echo " - '${KATELLO_VERSION}'" >> theforeman.org/yaml/jobs/pipeline/katello-rpm-pipeline.yaml

1 change: 1 addition & 0 deletions theforeman.org/yaml/views/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
minor:
- '7'
- '8'
- '9'
Copy link
Member

Choose a reason for hiding this comment

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

This is called out as a manual TODO:

jenkins-jobs/branch-foreman

Lines 31 to 32 in b993393

# TODO This is a non-trivial addition to script
echo "Add ${FOREMAN_VERSION%*.} as a minor to theforeman.org/yaml/views/release.yml"


- view:
name: 'Foreman Nightly'
Expand Down