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 install-plugins.sh for update-center changes #964

Merged
merged 3 commits into from
Aug 28, 2020
Merged

Fix install-plugins.sh for update-center changes #964

merged 3 commits into from
Aug 28, 2020

Conversation

slide
Copy link
Member

@slide slide commented Jun 18, 2020

This uses the ?version= URL to determine the version specific update center. This is the canonical way to get the version specific update center, if one exists. Otherwise, it will return the update center for the latest.

cc @daniel-beck

This uses the ?version= URL to determine the version specific
update center. This is the canonical way to get the version
specific update center, if one exists. Otherwise, it will
return the update center for the latest.
@slide slide requested a review from a team as a code owner June 18, 2020 23:06
@slide slide changed the title Fix install-plugins.sh for update-center changes [WIP] Fix install-plugins.sh for update-center changes Jun 18, 2020
@slide slide marked this pull request as draft June 18, 2020 23:07
@slide slide changed the title [WIP] Fix install-plugins.sh for update-center changes Fix install-plugins.sh for update-center changes Jun 18, 2020
Copy link
Member

@daniel-beck daniel-beck left a comment

Choose a reason for hiding this comment

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

A good step in the right direction 👍

install-plugins.sh Outdated Show resolved Hide resolved
@@ -245,8 +245,9 @@ main() {

# Check if there's a version-specific update center, which is the case for LTS versions
jenkinsVersion="$(jenkinsMajorMinorVersion)"
if curl -fsL -o /dev/null "$JENKINS_UC/$jenkinsVersion"; then
JENKINS_UC_LATEST="$JENKINS_UC/$jenkinsVersion"
jenkinsUcJson=$(curl -Ls -o /dev/null -w "%{url_effective}" "${JENKINS_UC}/update-center.json?version=${jenkinsVersion}")
Copy link
Member

Choose a reason for hiding this comment

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

Clever, but still relies on internals, specifically the directory structure inside tiered update sites and the existence of latest/ directories in them (#953).

Personally I'd prefer if we could replace that by parsing the returned JSON, but I can understand if you want to put that off.

Copy link
Member Author

Choose a reason for hiding this comment

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

I would like not parse the JSON in a shall script and replace install-plugins.sh with the plugin-installation-manager-tool, but I am not sure how feasible that is at this point.

Copy link
Member

Choose a reason for hiding this comment

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

With jq it's straightforward enough, but I don't know whether that is a reasonable dependency to add here.

Copy link
Member Author

Choose a reason for hiding this comment

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

We would have to add it to each image type. I would prefer to hold off and just use the new tool that we want to move to anyway.

install-plugins.sh Show resolved Hide resolved
@daniel-beck
Copy link
Member

Any news here?

@slide
Copy link
Member Author

slide commented Aug 25, 2020

Looks like some test failures, let me look at them today.

@slide slide marked this pull request as ready for review August 26, 2020 15:18
@slide
Copy link
Member Author

slide commented Aug 26, 2020

Looks like test failures are intermittent?

@slide
Copy link
Member Author

slide commented Aug 27, 2020

@MarkEWaite any issues with this?

@MarkEWaite
Copy link
Contributor

No issues from me @slide

@slide slide merged commit d5dc7f1 into jenkinsci:master Aug 28, 2020
@slide slide deleted the gh_954 branch August 28, 2020 00:56
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.

4 participants