Updated plugins from experimental UC #312

jglick · 2018-10-08T19:26:45Z

Pulls in JEP-210 beta releases. @svanoort @dwnusbaum

jglick · 2018-10-08T19:27:08Z

services/Makefile

-	node ./prepare-essentials propose-updates
+	node ./prepare-essentials propose-updates --uc ./update-center.json
+
+propose-experimental-updates: update-center-experimental.json


Just offering an alternate target. Really this stuff should of course be replaced with usage of the updater logic from incrementals-tools so that we get a single consistent way to update everything to whatever is in master.

jglick · 2018-10-08T19:28:39Z

services/cli/manifest-resolver.js

+          try {
+            ok = compareVersions(needed[artifactId].version, plugin.version) == 1;
+          } catch (x) {
+            logger.warn(`Cannot compare ${artifactId}:${needed[artifactId].version} to ${plugin.version}: ${x}`);


Whatever Node library you are using to compare versions, it is hopeless in the face of the version numbers actually used in Jenkins components. We want to be using jenkinsci/lib-version-number instead. (As, for example, incrementals-tools does.)

I BTW, https://issues.jenkins-ci.org/browse/JENKINS-53767 is probably worth looking at. I agree at some point we'd need a central tool to do all this.

jglick · 2018-10-08T19:28:55Z

services/cli/manifest-resolver.js

@@ -204,6 +211,7 @@ class ManifestResolver {
            return false;
          }).forEach((dep) => {
            envNeeds[dep] = deps[dep];
+            // TODO this is printing bogus messages like: The docker-cloud environment also needs docker-plugin


Not sure what this is all about.

jglick · 2018-10-08T19:30:35Z

services/prepare-essentials

    const manifest = Manifest.loadFile();
-    manifest.getPlugins().forEach((plugin) => {
+    manifest.getActualPlugins().forEach((plugin) => {


The updater was failing to show updates to what was actually being delivered in status! It only listed newer versions of plugins which were already in spec. As I have noted before, this is not helpful, since for example workflow-aggregator itself does nothing and should have been removed as of Jenkins 2; we need to actually enumerate the plugins we want to ship.

jglick · 2018-10-08T19:30:56Z

services/prepare-essentials

-        (compareVersions(updated.version, plugin.version) == 1)) {
-        logger.info(`The update center has a newer ${plugin.artifactId}: ${updated.version}`);
+      if (updated == null) {
+        logger.warn(`No such plugin ${plugin.artifactId}`);


Hit this at one point, not sure why.

jglick · 2018-10-08T19:31:48Z

services/essentials.yaml

+      version: '2.7'
+    - groupId: org.jenkins-ci.plugins.workflow
+      artifactId: workflow-support
+      version: 2.21-beta-1


This block is what I was actually trying to accomplish: pull in JEP-210.

Though I'm not against supporting using the experimental UC, I think it can be useful in some cases, why didn't you just use Incrementals to bump to latest of these?

jglick · 2018-10-08T19:32:08Z

services/essentials.yaml

@@ -8,7 +8,7 @@ spec:
  plugins:
    - groupId: io.jenkins
      artifactId: configuration-as-code
-      version: '1.0'
+      version: '1.1'


Just updating everything while I am here.

jglick · 2018-10-08T19:33:19Z

services/essentials.yaml

+      version: 1.29.3
+    - groupId: org.jenkins-ci.plugins
+      artifactId: github-api
+      version: '1.92'


Seems the YAML serializer is more clever than we might like: x.y is quoted as a string but x.y.z is not, even though for our purposes we know all versions ought to be loaded as strings. JavaScript 🤷‍♂️

jglick · 2018-10-08T19:35:31Z

services/essentials.yaml

@@ -87,6 +129,15 @@ spec:
    - groupId: org.jenkins-ci.plugins
      artifactId: jira
      version: 3.0.2
+    - groupId: org.jenkins-ci.ui
+      artifactId: ace-editor


Hmm, we sort the status when we write it out; should we not also sort the spec?

(My advice remains to get rid of the separate spec and status sections.)

jenkinsadmin · 2018-10-08T19:38:21Z

Build failed; the context from the latest run is:

Expand to view

[Pipeline] [jenkinsciinfra/evergreen-backend] }
[jenkinsciinfra/evergreen-backend] Failed in branch jenkinsciinfra/evergreen-backend
[Pipeline] // parallel
[Pipeline] }
[Pipeline] // stage
[Pipeline] stage
[Pipeline] { (Test images)
Stage "Test images" skipped due to earlier failure(s)
[Pipeline] parallel
[Pipeline] [Docker Cloud image] { (Branch: Docker Cloud image)
[Pipeline] [AWS Cloud image (smokes)] { (Branch: AWS Cloud image (smokes))
[Pipeline] [Docker Cloud image] stage
[Pipeline] [Docker Cloud image] { (Docker Cloud image)
[Pipeline] [AWS Cloud image (smokes)] stage
[Pipeline] [AWS Cloud image (smokes)] { (AWS Cloud image (smokes))
Stage "Docker Cloud image" skipped due to earlier failure(s)
Stage "AWS Cloud image (smokes)" skipped due to earlier failure(s)
[Pipeline] [Docker Cloud image] }
[Pipeline] [AWS Cloud image (smokes)] }
[Pipeline] [Docker Cloud image] // stage
[Pipeline] [AWS Cloud image (smokes)] // stage
[Pipeline] [Docker Cloud image] }
[Docker Cloud image] Failed in branch Docker Cloud image
[Pipeline] [AWS Cloud image (smokes)] }
[AWS Cloud image (smokes)] Failed in branch AWS Cloud image (smokes)
[Pipeline] // parallel
[Pipeline] }
[Pipeline] // stage
[Pipeline] stage
[Pipeline] { (Publish jenkins/evergreen)
Stage "Publish jenkins/evergreen" skipped due to earlier failure(s)
[Pipeline] }
[Pipeline] // stage
[Pipeline] }
[Pipeline] // timestamps
[Pipeline] }
[Pipeline] // timeout
[Pipeline] }
[Pipeline] // withEnv
[Pipeline] }
[Pipeline] // withEnv
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline

GitHub has been notified of this commit’s build result

ERROR: script returned exit code 2
Finished: FAILURE

Powered by the Comment Logger

batmat

LGTM. It makes sense to me to support experimental UC in addition to the main one, though I wonder why we shouldn't anyway just jump to just using Incrementals.

But well, supporting this is probably good as we'll always find trickier cases where we'd like to consume experimental releases from non-incrementalified plugins, and having it is a good thing.

batmat · 2018-10-10T08:11:09Z

services/essentials.yaml

+      version: '2.7'
+    - groupId: org.jenkins-ci.plugins.workflow
+      artifactId: workflow-support
+      version: 2.21-beta-1


Though I'm not against supporting using the experimental UC, I think it can be useful in some cases, why didn't you just use Incrementals to bump to latest of these?

batmat · 2018-10-10T10:34:11Z

services/cli/manifest-resolver.js

+          try {
+            ok = compareVersions(needed[artifactId].version, plugin.version) == 1;
+          } catch (x) {
+            logger.warn(`Cannot compare ${artifactId}:${needed[artifactId].version} to ${plugin.version}: ${x}`);


I BTW, https://issues.jenkins-ci.org/browse/JENKINS-53767 is probably worth looking at. I agree at some point we'd need a central tool to do all this.

jglick · 2018-10-10T14:37:05Z

support experimental UC in addition to the main one, though I wonder why we shouldn't anyway just jump to just using Incrementals

That would be my preference. I was making the minimal change I needed to get this particular set of updates in (with repeatable tooling rather than one-off edits). As noted in #312 (comment) I am not aware of existing tooling to do this.

jglick · 2018-10-10T14:42:38Z

cases where we'd like to consume experimental releases from non-incrementalified plugins

Well, you could always just file a PR to

mvn incrementals:incrementalify

and ship the result. :-)

rtyler · 2018-10-10T16:42:38Z

Going to bring these in before some other updates just to keep the pipes moving

Updated plugins from experimental UC.

069eb86

jglick commented Oct 8, 2018

View reviewed changes

jglick and others added 3 commits October 8, 2018 18:05

Lint.

cfa801a

Merge branch 'master' into updates

d5109b4

Merge branch 'master' into updates

7549147

batmat self-requested a review October 10, 2018 08:04

batmat approved these changes Oct 10, 2018

View reviewed changes

Merge branch 'master' into updates

1f47af1

rtyler merged commit 4c6ce7c into jenkins-infra:master Oct 10, 2018

jglick deleted the updates branch October 11, 2018 14:52

jglick mentioned this pull request Oct 31, 2018

Apply core & a few plugin updates jenkins-x/jenkins-x-serverless#56

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updated plugins from experimental UC #312

Updated plugins from experimental UC #312

jglick commented Oct 8, 2018

jglick Oct 8, 2018

jglick Oct 8, 2018

batmat Oct 10, 2018

jglick Oct 8, 2018

jglick Oct 8, 2018

jglick Oct 8, 2018

jglick Oct 8, 2018

batmat Oct 10, 2018

jglick Oct 8, 2018

jglick Oct 8, 2018

jglick Oct 8, 2018

jenkinsadmin commented Oct 8, 2018

batmat left a comment

batmat Oct 10, 2018

batmat Oct 10, 2018

jglick commented Oct 10, 2018

jglick commented Oct 10, 2018

rtyler commented Oct 10, 2018

Updated plugins from experimental UC #312

Updated plugins from experimental UC #312

Conversation

jglick commented Oct 8, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jenkinsadmin commented Oct 8, 2018

batmat left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jglick commented Oct 10, 2018

jglick commented Oct 10, 2018

rtyler commented Oct 10, 2018