[JENKINS-73760] Updates fail due to invalid JSON from HTTP Update Center #9760

basil · 2024-09-19T17:11:35Z

See JENKINS-73760. Partial revert of #6116, which deprecated/removed useful functionality (the ability to migrate old update sites to new ones). #2996 should have used this subsystem but did not, resulting in JENKINS-73760. This PR restores the subsystem and correctly applies it to #2996 to complete the migration from http://updates.jenkins-ci.org to https://updates.jenkins.io which was begun in 2017.

Testing done

New unit tests.

Proposed changelog entries

Migrate from http://updates.jenkins-ci.org to https://updates.jenkins.io when the initial installation version was 2.76 or older.

Proposed upgrade guidelines

N/A

Submitter checklist

Give feedback

The Jira issue, if it exists, is well-described.
The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see examples). Fill in the Proposed upgrade guidelines section only if there are breaking changes or changes that may require extra steps from users during upgrade.
There is automated testing or an explanation as to why this change has no tests.
New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
New or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives (see documentation).
For dependency updates, there are links to external changelogs and, if possible, full differentials.
For new APIs and extension points, there is a link to at least one consumer.
Options

Desired reviewers

@mention

Before the changes are marked as ready-for-merge:

Maintainer checklist

Give feedback

There are at least two (2) approvals for the pull request and no outstanding requests for change.
Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
Proper changelog labels are set so that the changelog can be generated automatically.
If the change needs additional upgrade steps from users, the upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the pull request title (see example).
If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).
Options

basil · 2024-09-19T17:12:04Z

core/src/main/java/hudson/model/UpdateSite.java

-     * @deprecated
-     *      Will be removed, currently returns always false.


Reverting this hunk of #6116, since this functionality is useful and should not be deprecated.

basil · 2024-09-19T17:12:14Z

core/src/main/java/hudson/model/UpdateSite.java

-     * @since 2.343
+     * @since 1.357


This was just wrong. This method was introduced in 1.357.

basil · 2024-09-19T17:12:29Z

core/src/main/java/hudson/model/UpdateSite.java

     */
-    @Deprecated


Reverting this hunk of #6116, since this functionality is useful and should not be deprecated.

basil · 2024-09-19T17:13:36Z

core/src/main/java/hudson/model/UpdateSite.java

+    private boolean isJenkinsCI() {
+        return url != null
+                && UpdateCenter.PREDEFINED_UPDATE_SITE_ID.equals(id)
+                && url.startsWith("http://updates.jenkins-ci.org/");


Adapting the pre-#6116 code to handle the migration from http://updates.jenkins-ci.org to https://updates.jenkins.io rather than the migration from http://hudson-ci.org to http://updates.jenkins-ci.org

basil · 2024-09-19T17:14:10Z

test/src/test/java/hudson/model/UpdateCenterMigrationTest.java

+    };
+
+    @Issue("JENKINS-73760")
+    @LocalData


hudson.model.UpdateCenter.xml taken from a stock 2.76 installation.

basil · 2024-09-19T17:14:26Z

test/src/test/java/hudson/model/UpdateSiteTest.java

+    @Issue("JENKINS-73760")
+    @Test
+    public void isLegacyDefault() {
+        assertFalse("isLegacyDefault should be false with null id", new UpdateSite(null, "url").isLegacyDefault());
+        assertFalse(
+                "isLegacyDefault should be false when id is not default and url is http://updates.jenkins-ci.org/",
+                new UpdateSite("dummy", "http://updates.jenkins-ci.org/").isLegacyDefault());
+        assertTrue(
+                "isLegacyDefault should be true when id is default and url is http://updates.jenkins-ci.org/",
+                new UpdateSite(UpdateCenter.PREDEFINED_UPDATE_SITE_ID, "http://updates.jenkins-ci.org/").isLegacyDefault());
+        assertFalse("isLegacyDefault should be false with null url", new UpdateSite(null, null).isLegacyDefault());
+    }
+


Adapting the pre-#6116 code to handle the migration from http://updates.jenkins-ci.org to https://updates.jenkins.io rather than the migration from http://hudson-ci.org to http://updates.jenkins-ci.org

timja

Thanks!

timja · 2024-09-22T21:30:30Z

/label ready-for-merge

This PR is now ready for merge, after ~24 hours, we will merge it if there's no negative feedback.

Thanks!

…ter (jenkinsci#9760) (cherry picked from commit 47a212a)

[JENKINS-73760] Updates fail due to invalid JSON from HTTP Update Center

76fc6ca

basil added the bug For changelog: Minor bug. Will be listed after features label Sep 19, 2024

basil commented Sep 19, 2024

View reviewed changes

basil mentioned this pull request Sep 20, 2024

[INFRA-3100] Migrate updates.jenkins.io to another Cloud jenkins-infra/helpdesk#2649

Open

timja approved these changes Sep 22, 2024

View reviewed changes

NotMyFault approved these changes Sep 22, 2024

View reviewed changes

comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Sep 22, 2024

MarkEWaite merged commit 47a212a into jenkinsci:master Oct 2, 2024
15 checks passed

MarkEWaite pushed a commit to MarkEWaite/jenkins that referenced this pull request Oct 5, 2024

[JENKINS-73760] Updates fail due to invalid JSON from HTTP Update Cen…

6b96db2

…ter (jenkinsci#9760) (cherry picked from commit 47a212a)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[JENKINS-73760] Updates fail due to invalid JSON from HTTP Update Center #9760

[JENKINS-73760] Updates fail due to invalid JSON from HTTP Update Center #9760

basil commented Sep 19, 2024 •

edited

Loading

Submitter checklist

Maintainer checklist

basil Sep 19, 2024

basil Sep 19, 2024

basil Sep 19, 2024

basil Sep 19, 2024 •

edited

Loading

basil Sep 19, 2024

basil Sep 19, 2024 •

edited

Loading

timja left a comment

timja commented Sep 22, 2024

		* @deprecated
		* Will be removed, currently returns always false.

[JENKINS-73760] Updates fail due to invalid JSON from HTTP Update Center #9760

[JENKINS-73760] Updates fail due to invalid JSON from HTTP Update Center #9760

Conversation

basil commented Sep 19, 2024 • edited Loading

Testing done

Proposed changelog entries

Proposed upgrade guidelines

Submitter checklist

Desired reviewers

Maintainer checklist

basil Sep 19, 2024

Choose a reason for hiding this comment

basil Sep 19, 2024

Choose a reason for hiding this comment

basil Sep 19, 2024

Choose a reason for hiding this comment

basil Sep 19, 2024 • edited Loading

Choose a reason for hiding this comment

basil Sep 19, 2024

Choose a reason for hiding this comment

basil Sep 19, 2024 • edited Loading

Choose a reason for hiding this comment

timja left a comment

Choose a reason for hiding this comment

timja commented Sep 22, 2024

basil commented Sep 19, 2024 •

edited

Loading

basil Sep 19, 2024 •

edited

Loading

basil Sep 19, 2024 •

edited

Loading