fabric8io / openshift-jenkins-s2i-config

Config repo used to build a customised OpenShift Jenkins image using S2I
6 stars 23 forks source link

Switch to using upstream Jenkins Master #215

Closed arilivigni closed 3 years ago

arilivigni commented 5 years ago
centos-ci commented 5 years ago

Can one of the admins verify this patch?

piyush-garg commented 5 years ago

[test]

fabric8cd commented 5 years ago

Good news @arilivigni snapshot Jenkins image is available. docker pull fabric8/jenkins-openshift:SNAPSHOT-PR-215-55

piyush-garg commented 5 years ago

Tested patch :

Plugins Failed

There are 14 failed plugins: blueocean-pipeline-scm-api; blueocean-core-js; blueocean-web; blueocean-rest-impl; blueocean-pipeline-api-impl; blueocean-bitbucket-pipeline; blueocean-config; blueocean-dashboard; blueocean-events; blueocean-git-pipeline; blueocean-github-pipeline; blueocean-personalization; blueocean-pipeline-editor; blueocean]

The build did not start

Need to check the login plugin, as I have admin rights there, so can't check.

piyush-garg commented 5 years ago

[test]

arilivigni commented 5 years ago

[test]

piyush-garg commented 5 years ago

[test]

arilivigni commented 5 years ago

[test]

arilivigni commented 5 years ago

[test]

piyush-garg commented 5 years ago

[test]

arilivigni commented 5 years ago

[test]

arilivigni commented 5 years ago

[test]

piyush-garg commented 5 years ago

[test]

fabric8cd commented 5 years ago

Good news @arilivigni snapshot Jenkins image is available. docker pull fabric8/jenkins-openshift:SNAPSHOT-PR-215-64

piyush-garg commented 5 years ago

[test]

fabric8cd commented 5 years ago

Good news @arilivigni snapshot Jenkins image is available. docker pull fabric8/jenkins-openshift:SNAPSHOT-PR-215-65

fabric8cd commented 5 years ago

Good news @arilivigni snapshot Jenkins image is available. docker pull fabric8/jenkins-openshift:SNAPSHOT-PR-215-66

fabric8cd commented 5 years ago

Good news @arilivigni snapshot Jenkins image is available. docker pull fabric8/jenkins-openshift:SNAPSHOT-PR-215-67

fabric8cd commented 5 years ago

Good news @arilivigni snapshot Jenkins image is available. docker pull fabric8/jenkins-openshift:SNAPSHOT-PR-215-68

arilivigni commented 5 years ago

[test]

fabric8cd commented 5 years ago

Good news @arilivigni snapshot Jenkins image is available. docker pull fabric8/jenkins-openshift:SNAPSHOT-PR-215-69

fabric8cd commented 5 years ago

Good news @arilivigni snapshot Jenkins image is available. docker pull fabric8/jenkins-openshift:SNAPSHOT-PR-215-70

arilivigni commented 5 years ago

@sthaha @piyush-garg @rupalibehera the last two snapshots deployed in my cluster just fine and I was able to run a full pipeline. I think we are finally in a good place. Once this is merged it would be great to look at getting rid of the specific forks of plugins

hrishin commented 5 years ago

@arilivigni I've tested the fabric8/jenkins-openshift:SNAPSHOT-PR-215-70 and few plugins are failing. This is the right image to test? Can anyone also test it?

@rupalibehera @piyush-garg

Jenkins DC Logs: https://pastebin.com/74NUSk0L

image

arilivigni commented 5 years ago

@hrishin They show that but it does not block anything it just doesn't load blue ocean. We don't have a way around that since it is part of the base image. This may be a fact that there are conflicts with other plugins that we forked that can't change. I don't look at this as a blocker.

fabric8cd commented 5 years ago

Good news @arilivigni snapshot Jenkins image is available. docker pull fabric8/jenkins-openshift:SNAPSHOT-PR-215-71

arilivigni commented 5 years ago

@hrishin fixed with latest snapshot loaded blueocean 1.5.0

hrishin commented 5 years ago

Thats right @arilivigni. Thank you! :tada: for fixing the blue-ocean.

Jenkins Logs: https://pastebin.com/XEyqPFh2

Build Log: https://pastebin.com/gq4ptRXJ :tada:

works fine

image

hrishin commented 5 years ago

@arilivigni just FYI,openshift/jenkins-2-centos7:v4.0 got updated with login plugin fix.

piyush-garg commented 5 years ago

@sthaha @hrishin

I have tested this patch

Test 1 - Jenkins boots

Test 2 - Start pipeline works

Test 3 - Stop pipeline from the openshift console works

Test 4 - PR results in a build

Test 5 - Pushing to master results in a build and that shows up on osio-pipeline as well

I have tested both f-p-l and osio-pipeline. Both pipelines worked fine for me.

One more behavior I have seen, slave pods, after completing their work, are going in the error state and not getting deleted. this is resulting in resource quota, and the job is getting hanged. I need to manually delete those pods to start further. I am not sure whether this behavior started after my patch or this patch. I think we need to look into kubernetes plugin to resolve this.

Thanks

gabemontero commented 5 years ago

@bparees @sspeiche fyi ... more fabric8 migration to our upstream jenkins

arilivigni commented 5 years ago

@piyush-garg @sthaha @hrishin I saw things working fine in my environment with running the pipeline. Recently I reran with my change to the usptream image and also with the original fabric8 image and it failed in the same way so something else must have changed.

fabric8cd commented 5 years ago

Good news @arilivigni snapshot Jenkins image is available. docker pull fabric8/jenkins-openshift:SNAPSHOT-PR-215-77

arilivigni commented 5 years ago

@piyush-garg @sthaha @hrishin I ran this with master and PR and all worked as expected when I moved to the 1.10.2 version of the kube plugin. screenshot from 2018-11-08 22-59-56 screenshot from 2018-11-08 23-00-38

consoleText.txt

arilivigni commented 5 years ago

PR test screenshot from 2018-11-08 23-20-16 screenshot from 2018-11-08 23-20-48 consoleTextTestPR.txt

fabric8cd commented 5 years ago

Good news @arilivigni snapshot Jenkins image is available. docker pull fabric8/jenkins-openshift:SNAPSHOT-PR-215-79

piyush-garg commented 5 years ago

@sthaha @hrishin @arilivigni

I have tested this patch again, sorry for the delay

Test 1 - Jenkins boots

Test 2 - Setup pipeline works

Test 3 - cancel build from the openshift console works

Test 4 - cancel build from the Jenkins console works

Test 5 - PR results in a build

Test 6 - PR merge results in a master build

Test 7 - Pushing to master results in a build and that shows up on osio-pipeline as well

Test 8 - Start pipeline works

Test 9 - Timer in the pipeline

oso time during running oso-time during running

osio time during running osio-time

oso time after completion oso-time-c

osio time after competion osio-time-c

Test 10 - jenkins idles after no activity

Test 11 - Promote abort button works after idling

I have tested with fabric8-pipeline-library

Thanks

arilivigni commented 5 years ago

@piyush-garg thanks so much so can this be merged @sthaha?

sthaha commented 5 years ago

@arilivigni yes, it looks promising. I think we should a quick test using the osio-pipeline as well which IIRC @pradeepitm12 is doing.

pradeepitm12 commented 5 years ago

@sthaha I have tested the patch with osio pipeline, @arilivigni we are good to go.

rupalibehera commented 5 years ago

please hold merging the PR until we are done testing -> 1. Adding deleting plugins 2. readonly mounts issue

rupalibehera commented 5 years ago

Observations after testing the image w.r.t adding new plugins:

  1. when adding it via https://github.com/fabric8io/openshift-jenkins-s2i-config/blob/master/plugins.txt it does seem to work, I tried it twice once I could saw the plugin was installed on the image and but was not copied to $JENKINS_HOME/plugins directory when Jenkins boots up (here : https://ci.centos.org/job/devtools-openshift-jenkins-s2i-config-fabric8-push-prcheck/95/console , I added gravatar plugin and it was installed in the image) and second time I did not see it installing in the image itself so it was also not present in $JENKINS_HOME/plugins folder (here: https://ci.centos.org/job/devtools-openshift-jenkins-s2i-config-fabric8-push-prcheck/104/console, I added monitoring plugin and it is not build in the image itself ). Hence when adding a plugin via plugins.txt it does not seem to work.
  2. when adding a plugin in https://github.com/fabric8io/openshift-jenkins-s2i-config/tree/master/plugins directory it seems to be getting installed in $JENKINS_HOME/plugins folder. Hence when adding a plugin via plugins folder is working.
  3. I do not see the Read only mount issue [https://github.com/openshiftio/openshift.io/issues/2608]
  4. Also do not see plugin getting copying over again and again on every bootup of Jenkins [https://github.com/openshiftio/openshift.io/issues/2612]

@arilivigni , I went through the readme https://github.com/openshift/jenkins#installing-using-s2i-build which still mentions the same way to install plugins. @arilivigni could you please check if there is any change openshift team has recently made to update plugins. or we are missing something. We cannot merge this PR until then.

arilivigni commented 5 years ago

@rupalibehera I am not sure what these questions have to do with this PR. This was to get us switched over to the upstream image and have stability. @piyush-garg testing showed that this all worked so if we want to tackle plugins that should be a separate PR. I took what we had available for plugins and packaged them in this image and again it all works. I would like to handle any plugin mechanism as a separate PR now that we have this building block. Thoughts?

fabric8cd commented 5 years ago

Good news @arilivigni snapshot Jenkins image is available. docker pull fabric8/jenkins-openshift:SNAPSHOT-PR-215-105

fabric8cd commented 5 years ago

Good news @arilivigni snapshot Jenkins image is available. docker pull fabric8/jenkins-openshift:SNAPSHOT-PR-215-106

arilivigni commented 5 years ago

@rupalib @pgarg, @sthaha and I did all the tests but one and all passed. I still have to create a version of a custom plugin and build it and then deploy that to make sure the plugin version changed. Thanks again @sthaha for the help!

fabric8cd commented 5 years ago

Good news @arilivigni snapshot Jenkins image is available. docker pull fabric8/jenkins-openshift:SNAPSHOT-PR-215-116

fabric8cd commented 5 years ago

Good news @arilivigni snapshot Jenkins image is available. docker pull fabric8/jenkins-openshift:SNAPSHOT-PR-215-117

fabric8cd commented 5 years ago

Good news @arilivigni snapshot Jenkins image is available. docker pull fabric8/jenkins-openshift:SNAPSHOT-PR-215-125

arilivigni commented 5 years ago

@piyush-garg @rupalibehera I have tested this with all the scenarios required. Can you both run it through your testing and make sure it meets your level of expectations? Thanks! @pradeepto FYI