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

Set default VARIABLE_FILE parameter #18117

Merged
merged 1 commit into from
Sep 11, 2023
Merged

Set default VARIABLE_FILE parameter #18117

merged 1 commit into from
Sep 11, 2023

Conversation

fengxue-IS
Copy link
Contributor

infra issue 6519

@fengxue-IS
Copy link
Contributor Author

FYI @AdamBrousseau

@AdamBrousseau
Copy link
Contributor

jenkins compile amac jdk11

@AdamBrousseau
Copy link
Contributor

AdamBrousseau commented Sep 11, 2023 •
edited
Loading

Test without change shows variable file is not getting processed if all 3 VENDOR args are not passed. We typically only pass repo and branch for the openj9 release builds.
https://openj9-jenkins.osuosl.org/job/Pipeline-Release-0.40.0-Build11/13/
Child jobs show the openssl version passed in get source args is 3.10* which is the latest from defaults.yml.
Further, you can not see vendor file being checked out in build 13.

00:00:38.839  VARIABLE_FILE:''
[Pipeline] echo
00:00:38.843  VENDOR_REPO:'https://github.com/eclipse-openj9/openj9.git'
[Pipeline] echo
00:00:38.846  VENDOR_BRANCH:'v0.40.0-release'
[Pipeline] echo
00:00:38.848  VENDOR_CREDENTIALS_ID:''
[Pipeline] fileExists
[Pipeline] echo
00:00:38.862  Using variables file: buildenv/jenkins/variables/defaults.yml

With this change,
https://openj9-jenkins.osuosl.org/job/Pipeline-Release-0.40.0-Build11/15/
Shows the proper openssl version 1.1.1v from the 40-release branch defaults.yml is being passed.
eg
https://openj9-jenkins.osuosl.org/job/Pipeline_Build_Test_JDK11_ppc64le_linux/1880/parameters/
You can also see the vendor file being checked out in build 15

00:01:11.843  VARIABLE_FILE:'buildenv/jenkins/variables/defaults.yml'
[Pipeline] echo
00:01:11.847  VENDOR_REPO:'https://github.com/eclipse-openj9/openj9.git'
[Pipeline] echo
00:01:11.852  VENDOR_BRANCH:'v0.40.0-release'
[Pipeline] echo
00:01:11.855  VENDOR_CREDENTIALS_ID:''
[Pipeline] sh
00:01:12.140  + git config remote.vendor.url https://github.com/eclipse-openj9/openj9.git
[Pipeline] sh
00:01:12.413  + git config remote.vendor.fetch +refs/heads/v0.40.0-release:refs/remotes/vendor/v0.40.0-release
[Pipeline] sh
00:01:12.691  + git fetch vendor
00:01:13.242  From https://github.com/eclipse-openj9/openj9
00:01:13.242   * [new branch]              v0.40.0-release    -> vendor/v0.40.0-release
00:01:13.242   * [new tag]                 openj9-0.0         -> openj9-0.0
00:01:13.242   * [new tag]                 openj9-0.0M1       -> openj9-0.0M1
00:01:13.242   * [new tag]                 openj9-0.0RC2      -> openj9-0.0RC2
00:01:13.242   * [new tag]                 openj9-0.10.0      -> openj9-0.10.0
00:01:13.242   * [new tag]                 openj9-0.10.0-rc1  -> openj9-0.10.0-rc1
00:01:13.242   * [new tag]                 openj9-0.10.0-rc2  -> openj9-0.10.0-rc2
00:01:13.242   * [new tag]                 openj9-0.11.0      -> openj9-0.11.0
00:01:13.242   * [new tag]                 openj9-0.11.0-rc1  -> openj9-0.11.0-rc1
00:01:13.242   * [new tag]                 openj9-0.11.0-rc2  -> openj9-0.11.0-rc2
00:01:13.242   * [new tag]                 openj9-0.12.0      -> openj9-0.12.0
00:01:13.242   * [new tag]                 openj9-0.12.0-m1   -> openj9-0.12.0-m1
00:01:13.242   * [new tag]                 openj9-0.12.0-m2   -> openj9-0.12.0-m2
00:01:13.242   * [new tag]                 openj9-0.12.0-rc1  -> openj9-0.12.0-rc1
00:01:13.242   * [new tag]                 openj9-0.12.0-rc2  -> openj9-0.12.0-rc2
00:01:13.242   * [new tag]                 openj9-0.12.1      -> openj9-0.12.1
00:01:13.242   * [new tag]                 openj9-0.13.0      -> openj9-0.13.0
00:01:13.242   * [new tag]                 openj9-0.13.0-m1   -> openj9-0.13.0-m1
00:01:13.242   * [new tag]                 openj9-0.13.0-rc1  -> openj9-0.13.0-rc1
00:01:13.242   * [new tag]                 openj9-0.14.0      -> openj9-0.14.0
00:01:13.242   * [new tag]                 openj9-0.14.0-m1   -> openj9-0.14.0-m1
00:01:13.242   * [new tag]                 openj9-0.14.0-rc1  -> openj9-0.14.0-rc1
00:01:13.242   * [new tag]                 openj9-0.14.1      -> openj9-0.14.1
00:01:13.243   * [new tag]                 openj9-0.14.2      -> openj9-0.14.2
00:01:13.243   * [new tag]                 openj9-0.14.3      -> openj9-0.14.3
00:01:13.243   * [new tag]                 openj9-0.15.0      -> openj9-0.15.0
00:01:13.243   * [new tag]                 openj9-0.15.0-m1   -> openj9-0.15.0-m1
00:01:13.243   * [new tag]                 openj9-0.15.1      -> openj9-0.15.1
00:01:13.243   * [new tag]                 openj9-0.16.0      -> openj9-0.16.0
00:01:13.243   * [new tag]                 openj9-0.16.0-m1   -> openj9-0.16.0-m1
00:01:13.243   * [new tag]                 openj9-0.16.0-m2   -> openj9-0.16.0-m2
00:01:13.243   * [new tag]                 openj9-0.17.0      -> openj9-0.17.0
00:01:13.243   * [new tag]                 openj9-0.17.0-m1   -> openj9-0.17.0-m1
00:01:13.243   * [new tag]                 openj9-0.17.0-m2   -> openj9-0.17.0-m2
00:01:13.243   * [new tag]                 openj9-0.18.0      -> openj9-0.18.0
00:01:13.243   * [new tag]                 openj9-0.18.0-m1   -> openj9-0.18.0-m1
00:01:13.243   * [new tag]                 openj9-0.18.0-m2   -> openj9-0.18.0-m2
00:01:13.243   * [new tag]                 openj9-0.18.1      -> openj9-0.18.1
00:01:13.243   * [new tag]                 openj9-0.19.0      -> openj9-0.19.0
00:01:13.243   * [new tag]                 openj9-0.19.0-m1   -> openj9-0.19.0-m1
00:01:13.243   * [new tag]                 openj9-0.19.0-m2   -> openj9-0.19.0-m2
00:01:13.243   * [new tag]                 openj9-0.20.0      -> openj9-0.20.0
00:01:13.243   * [new tag]                 openj9-0.20.0-m1   -> openj9-0.20.0-m1
00:01:13.243   * [new tag]                 openj9-0.20.0-m2   -> openj9-0.20.0-m2
00:01:13.243   * [new tag]                 openj9-0.21.0      -> openj9-0.21.0
00:01:13.243   * [new tag]                 openj9-0.21.0-m1   -> openj9-0.21.0-m1
00:01:13.243   * [new tag]                 openj9-0.21.0-m2   -> openj9-0.21.0-m2
00:01:13.243   * [new tag]                 openj9-0.22.0      -> openj9-0.22.0
00:01:13.243   * [new tag]                 openj9-0.22.0-m1   -> openj9-0.22.0-m1
00:01:13.243   * [new tag]                 openj9-0.22.0-m2   -> openj9-0.22.0-m2
00:01:13.243   * [new tag]                 openj9-0.23.0      -> openj9-0.23.0
00:01:13.243   * [new tag]                 openj9-0.23.0-m1   -> openj9-0.23.0-m1
00:01:13.243   * [new tag]                 openj9-0.23.0-m2   -> openj9-0.23.0-m2
00:01:13.243   * [new tag]                 openj9-0.24.0      -> openj9-0.24.0
00:01:13.243   * [new tag]                 openj9-0.24.0-m1   -> openj9-0.24.0-m1
00:01:13.243   * [new tag]                 openj9-0.24.0-m2   -> openj9-0.24.0-m2
00:01:13.243   * [new tag]                 openj9-0.25.0      -> openj9-0.25.0
00:01:13.243   * [new tag]                 openj9-0.25.0-m1   -> openj9-0.25.0-m1
00:01:13.243   * [new tag]                 openj9-0.25.0-m2   -> openj9-0.25.0-m2
00:01:13.243   * [new tag]                 openj9-0.25.0-m3   -> openj9-0.25.0-m3
00:01:13.243   * [new tag]                 openj9-0.26.0      -> openj9-0.26.0
00:01:13.243   * [new tag]                 openj9-0.26.0-m1   -> openj9-0.26.0-m1
00:01:13.243   * [new tag]                 openj9-0.26.0-m2   -> openj9-0.26.0-m2
00:01:13.243   * [new tag]                 openj9-0.27.0      -> openj9-0.27.0
00:01:13.243   * [new tag]                 openj9-0.27.0-m1   -> openj9-0.27.0-m1
00:01:13.243   * [new tag]                 openj9-0.27.0-m2   -> openj9-0.27.0-m2
00:01:13.243   * [new tag]                 openj9-0.27.1      -> openj9-0.27.1
00:01:13.243   * [new tag]                 openj9-0.28.0-m1   -> openj9-0.28.0-m1
00:01:13.243   * [new tag]                 openj9-0.28.0-m2   -> openj9-0.28.0-m2
00:01:13.243   * [new tag]                 openj9-0.29.0      -> openj9-0.29.0
00:01:13.243   * [new tag]                 openj9-0.29.0-m1   -> openj9-0.29.0-m1
00:01:13.243   * [new tag]                 openj9-0.29.0-m2   -> openj9-0.29.0-m2
00:01:13.243   * [new tag]                 openj9-0.29.0-m2a  -> openj9-0.29.0-m2a
00:01:13.243   * [new tag]                 openj9-0.29.1      -> openj9-0.29.1
00:01:13.243   * [new tag]                 openj9-0.29.1-m1   -> openj9-0.29.1-m1
00:01:13.243   * [new tag]                 openj9-0.30.0      -> openj9-0.30.0
00:01:13.243   * [new tag]                 openj9-0.30.0-m1   -> openj9-0.30.0-m1
00:01:13.243   * [new tag]                 openj9-0.30.0-m1a  -> openj9-0.30.0-m1a
00:01:13.243   * [new tag]                 openj9-0.30.0-m2   -> openj9-0.30.0-m2
00:01:13.243   * [new tag]                 openj9-0.30.0-m3   -> openj9-0.30.0-m3
00:01:13.243   * [new tag]                 openj9-0.30.0-m3a  -> openj9-0.30.0-m3a
00:01:13.243   * [new tag]                 openj9-0.30.0-rc1  -> openj9-0.30.0-rc1
00:01:13.243   * [new tag]                 openj9-0.30.1      -> openj9-0.30.1
00:01:13.243   * [new tag]                 openj9-0.31.0-m1   -> openj9-0.31.0-m1
00:01:13.243   * [new tag]                 openj9-0.31.0-m2   -> openj9-0.31.0-m2
00:01:13.243   * [new tag]                 openj9-0.31.0-rc1  -> openj9-0.31.0-rc1
00:01:13.243   * [new tag]                 openj9-0.31.0-rc1a -> openj9-0.31.0-rc1a
00:01:13.243   * [new tag]                 openj9-0.32.0      -> openj9-0.32.0
00:01:13.243   * [new tag]                 openj9-0.32.0-m1   -> openj9-0.32.0-m1
00:01:13.244   * [new tag]                 openj9-0.32.0-m1a  -> openj9-0.32.0-m1a
00:01:13.244   * [new tag]                 openj9-0.32.0-m2   -> openj9-0.32.0-m2
00:01:13.244   * [new tag]                 openj9-0.32.0-rc1  -> openj9-0.32.0-rc1
00:01:13.244   * [new tag]                 openj9-0.33.0      -> openj9-0.33.0
00:01:13.244   * [new tag]                 openj9-0.33.0-m1   -> openj9-0.33.0-m1
00:01:13.244   * [new tag]                 openj9-0.33.0-m2   -> openj9-0.33.0-m2
00:01:13.244   * [new tag]                 openj9-0.33.0-m2a  -> openj9-0.33.0-m2a
00:01:13.244   * [new tag]                 openj9-0.33.0-rc1  -> openj9-0.33.0-rc1
00:01:13.244   * [new tag]                 openj9-0.33.0-rc1a -> openj9-0.33.0-rc1a
00:01:13.244   * [new tag]                 openj9-0.33.1      -> openj9-0.33.1
00:01:13.244   * [new tag]                 openj9-0.33.1-rc1  -> openj9-0.33.1-rc1
00:01:13.244   * [new tag]                 openj9-0.35.0      -> openj9-0.35.0
00:01:13.244   * [new tag]                 openj9-0.35.0-m1   -> openj9-0.35.0-m1
00:01:13.244   * [new tag]                 openj9-0.35.0-m2   -> openj9-0.35.0-m2
00:01:13.244   * [new tag]                 openj9-0.35.0-m2a  -> openj9-0.35.0-m2a
00:01:13.244   * [new tag]                 openj9-0.35.0-m2b  -> openj9-0.35.0-m2b
00:01:13.244   * [new tag]                 openj9-0.35.0-rc1  -> openj9-0.35.0-rc1
00:01:13.244   * [new tag]                 openj9-0.36.0      -> openj9-0.36.0
00:01:13.244   * [new tag]                 openj9-0.36.1      -> openj9-0.36.1
00:01:13.244   * [new tag]                 openj9-0.37.0      -> openj9-0.37.0
00:01:13.244   * [new tag]                 openj9-0.38.0      -> openj9-0.38.0
00:01:13.244   * [new tag]                 openj9-0.39.0      -> openj9-0.39.0
00:01:13.244   * [new tag]                 openj9-0.40.0      -> openj9-0.40.0
00:01:13.244   * [new tag]                 openj9-0.8.0       -> openj9-0.8.0
00:01:13.244   * [new tag]                 openj9-0.8.0-rc1   -> openj9-0.8.0-rc1
00:01:13.244   * [new tag]                 openj9-0.8.0-rc2   -> openj9-0.8.0-rc2
00:01:13.244   * [new tag]                 openj9-0.9.0       -> openj9-0.9.0
00:01:13.244   * [new tag]                 openj9-0.9.0-rc1   -> openj9-0.9.0-rc1
00:01:13.244   * [new tag]                 openj9-0.9.0-rc2   -> openj9-0.9.0-rc2
[Pipeline] sh
00:01:13.777  + git checkout vendor/v0.40.0-release -- buildenv/jenkins/variables/defaults.yml
[Pipeline] fileExists
[Pipeline] echo
00:01:14.356  Using variables file: buildenv/jenkins/variables/defaults.yml

AdamBrousseau
AdamBrousseau approved these changes Sep 11, 2023
View reviewed changes
Copy link
Contributor

@AdamBrousseau AdamBrousseau left a comment

Choose a reason for hiding this comment

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

Looks good. Thanks for the fix.

@AdamBrousseau AdamBrousseau merged commit 5bf1ff4 into eclipse-openj9:master Sep 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AdamBrousseau AdamBrousseau AdamBrousseau approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@fengxue-IS @AdamBrousseau