Skip to content

Bump configuration-as-code from 1.34 to 1.35 - #172

Merged
timja merged 28 commits into
jenkinsci:masterfrom
timja:revert-164-revert-161-patch-1
Apr 8, 2020
Merged

Bump configuration-as-code from 1.34 to 1.35#172
timja merged 28 commits into
jenkinsci:masterfrom
timja:revert-164-revert-161-patch-1

Conversation

@timja

@timja timja commented Jan 17, 2020

Copy link
Copy Markdown
Member

timja and others added 5 commits January 17, 2020 20:58
hack as I can't change the Jenkinsfile, note in this case it wasn't
noticed because the Jenkinsfile allows no test results, the pct build is
failing but the process doesn't exit with 1 as test_failures are
allowed, assuming they are reported on later, but because the build
failed there's no actual test failure. Not intending this for merge,
just so we can see the failures as we fix them
@timja

timja commented Jan 18, 2020

Copy link
Copy Markdown
Member Author

Currently failing on:
jenkinsci/script-security-plugin#284
and ssh-credentials

ssh-credentials bump has caused:

Require upper bound dependencies error for org.jenkins-ci:trilead-ssh2:build-217-jenkins-14 paths to dependency are:
+-io.jenkins.tools.bom:sample:6-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.176.3
    +-org.jenkins-ci:trilead-ssh2:build-217-jenkins-14
and
+-io.jenkins.tools.bom:sample:6-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.176.3
    +-org.jenkins-ci.main:cli:2.176.3
      +-org.jenkins-ci:trilead-ssh2:build214-jenkins-1
and
+-io.jenkins.tools.bom:sample:6-SNAPSHOT
  +-org.jenkins-ci.main:jenkins-core:2.176.3
    +-org.kohsuke:trilead-putty-extension:1.2
      +-org.jenkins-ci:trilead-ssh2:build214-jenkins-1
and
+-io.jenkins.tools.bom:sample:6-SNAPSHOT
  +-org.jenkins-ci.plugins:ssh-slaves:1.30.2
    +-org.jenkins-ci.plugins:ssh-credentials:1.18.1
      +-org.jenkins-ci.plugins:trilead-api:1.0.5
        +-org.jenkins-ci:trilead-ssh2:build-217-jenkins-16

commented here:
jenkinsci/ssh-credentials-plugin#49 (comment)

@jetersen

jetersen commented Jan 20, 2020

Copy link
Copy Markdown
Member

let's remove the fail fast, while testing? 🤔

@timja

timja commented Jan 20, 2020

Copy link
Copy Markdown
Member Author

let's remove the fail fast, while testing? 🤔

if i change the Jenkinsfile it will just be ignored,
maybe @jglick will change it for us 😉

@jetersen

Copy link
Copy Markdown
Member

if we ask nicely maybe we can get commit access? 🙇

@timja

timja commented Jan 20, 2020

Copy link
Copy Markdown
Member Author

if we ask nicely maybe we can get commit access? 🙇

Pretty please Jesse 😄

@timja
timja requested a review from jglick January 20, 2020 20:06
@timja

timja commented Jan 24, 2020

Copy link
Copy Markdown
Member Author

Seeing if the ansicolor failure is a flake or consistent

@timja timja closed this Jan 24, 2020
@timja timja reopened this Jan 24, 2020
@timja

timja commented Jan 24, 2020

Copy link
Copy Markdown
Member Author

failed this time on script-security.
would be good if we could get failFast disabled so we can see all the errors though.

cc @jglick

@timja

timja commented Jan 24, 2020

Copy link
Copy Markdown
Member Author

@jglick

jglick commented Jan 28, 2020

Copy link
Copy Markdown
Member

would be good if we could get failFast disabled

I am reluctant to disable failFast in master. Builds are very expensive, and there are a lot of failing PRs. I suppose I can try to load this flag from a separate file, so untrusted contributors can set it temporarily in a PR. Also I can give some people commit access.

@jglick jglick mentioned this pull request Jan 28, 2020
@amuniz

amuniz commented Feb 12, 2020

Copy link
Copy Markdown
Member

Oh, and this is why I don't like the PCT... it's testing a quite unreal setup.

@timja

timja commented Feb 12, 2020

Copy link
Copy Markdown
Member Author

thanks for taking a look @amuniz,

From what I can see it should be managed though,
https://github.com/jenkinsci/bom/blob/bom-4/bom-latest/pom.xml#L249

In that bom release it's importing other boms up until latest,
https://github.com/jenkinsci/bom/blob/bom-4/bom-2.138.x/pom.xml#L13-L19

@amuniz

amuniz commented Feb 12, 2020

Copy link
Copy Markdown
Member

How is bom-latest being picked up? I don't see it in https://github.com/jenkinsci/bom/blob/bom-4/bom-2.138.x/pom.xml

It looks they are picked up backward, but not forward (which seems correct).

@timja

timja commented Feb 12, 2020

Copy link
Copy Markdown
Member Author

If I run:

mvn help:effective-pom

I see:

      <dependency>
        <groupId>org.jenkins-ci.plugins</groupId>
        <artifactId>structs</artifactId>
        <version>1.20</version>
      </dependency>

https://github.com/jenkinsci/bom/blob/bom-4/bom-2.138.x/pom.xml#L15

https://github.com/jenkinsci/bom/blob/bom-4/bom-2.150.x/pom.xml#L15

...

@amuniz

amuniz commented Feb 12, 2020

Copy link
Copy Markdown
Member

Ah, ok. Then I have no idea 🤷‍♂️

@timja

timja commented Feb 12, 2020

Copy link
Copy Markdown
Member Author

@jglick any ideas?

@timja

timja commented Feb 12, 2020

Copy link
Copy Markdown
Member Author

Also @amuniz the bom change in workflow-step-api is unreleased, but even if I checkout the released version I have the same issue,

https://github.com/jenkinsci/workflow-step-api-plugin/pull/54/files#diff-600376dffeb79835ede4a0b285078036L88

@jglick

jglick commented Feb 12, 2020

Copy link
Copy Markdown
Member

Sorry, I have no time to work on this at the moment.

this is why I don't like the PCT... it's testing a quite unreal setup

Yes, no one likes it really, but we are sort of stuck with it because nearly all our test coverage presumes a Maven flat test classpath. There have been abortive efforts to create better systems.

@jglick
jglick removed their request for review February 18, 2020 22:40
@oleg-nenashev
oleg-nenashev self-requested a review February 26, 2020 09:28
Comment thread failFast Outdated
@timja
timja requested review from jetersen and jglick March 5, 2020 20:44
@timja
timja marked this pull request as ready for review March 5, 2020 20:44
@jglick

jglick commented Mar 5, 2020

Copy link
Copy Markdown
Member

You are busy! Thanks for moving this repo along.

@timja timja closed this Mar 10, 2020
@timja timja reopened this Mar 10, 2020
@jglick jglick added the dependencies Pull requests that update a dependency file label Mar 10, 2020

@oleg-nenashev oleg-nenashev left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I would rather bite the bullet and integrate it, even with Folders plugin suppressed. We can fix it in a follow-up, PCT patch is needed IIUC

@timja
timja merged commit 3713b8a into jenkinsci:master Apr 8, 2020
@timja
timja deleted the revert-164-revert-161-patch-1 branch April 8, 2020 08:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants