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

fix 3.9 jenkins job definitions #385

Merged
merged 1 commit into from
Nov 29, 2023
Merged

fix 3.9 jenkins job definitions #385

merged 1 commit into from
Nov 29, 2023

Conversation

evgeni
Copy link
Member

@evgeni evgeni commented Nov 29, 2023

Fixes: 55c177c

@evgeni evgeni changed the title add 3.9 to "be built by copr" list fix 3.9 jenkins job definitions Nov 29, 2023
@ekohl ekohl merged commit b993393 into theforeman:master Nov 29, 2023
2 checks passed

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:

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

@evgeni evgeni deleted the copr-39 branch November 29, 2023 11:19
Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

I did a more careful analysis of where it went wrong, but I can't explain it. It should all be covered. The PR was also made on top of a commit that had the correct script. The only thing I can think of is that it was made against an older version and then rebased before submitted as a PR.

@@ -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:

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

@@ -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:

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

@@ -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:

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

@@ -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:

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

@@ -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:

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:


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.

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

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

@evgeni
Copy link
Member Author

evgeni commented Nov 29, 2023

yeah, I have no idea how this happened.
I literally just ran the script on the commit before the "bad 3.9" one and took the diff here

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.

2 participants