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

Switch to using upstream Jenkins Master #215

Closed
wants to merge 21 commits into from
Closed

Switch to using upstream Jenkins Master #215

wants to merge 21 commits into from

Conversation

arilivigni
Copy link

  • Switch base image to openshift/jenkins-2-centos7
  • Update plugins.txt
  • Bump versions.txt
  • Remove openshift-login/openshift-sync jpi files

Ari LiVigni added 2 commits October 31, 2018 01:19
* Switch base image to openshift/jenkins-2-centos7
* Update plugins.txt
* Bump versions.txt
* Switch base image to openshift/jenkins-2-centos7
* Update plugins.txt
* Bump versions.txt
* Remove openshift-login/openshift-sync jpi files
@centos-ci
Copy link
Collaborator

Can one of the admins verify this patch?

@piyush-garg
Copy link

[test]

@fabric8cd
Copy link

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

@piyush-garg
Copy link

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.

* Switch base image to openshift/jenkins-2-centos7
* Update plugins.txt and remove base plugins from OpenShift image
* Bump versions.txt
* Add back openshift-login/openshift-sync jpi files
@piyush-garg
Copy link

[test]

3 similar comments
@arilivigni
Copy link
Author

[test]

@piyush-garg
Copy link

[test]

@arilivigni
Copy link
Author

[test]

* Switch base image to openshift/jenkins-2-centos7
* Update plugins.txt and remove base plugins from OpenShift image
* Bump versions.txt
* Add back openshift-login/openshift-sync jpi files
@arilivigni
Copy link
Author

[test]

1 similar comment
@piyush-garg
Copy link

[test]

…ns-s2i-config

# Conflicts:
#	.cico/setup.sh
#	plugins.txt
#	plugins/version.txt
@arilivigni
Copy link
Author

[test]

2 similar comments
@arilivigni
Copy link
Author

[test]

@piyush-garg
Copy link

[test]

@fabric8cd
Copy link

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

plugins/version.txt Outdated Show resolved Hide resolved
@piyush-garg
Copy link

[test]

@fabric8cd
Copy link

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

@fabric8cd
Copy link

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

@fabric8cd
Copy link

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

@arilivigni
Copy link
Author

@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
Copy link
Author

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

14

Choose a reason for hiding this comment

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

@arilivigni Can you please increment this. I think this will be required to load the plugin again and then we will et the new set.

Copy link
Author

Choose a reason for hiding this comment

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

@piyush-garg done but that shouldn't affect testing the image.

@fabric8cd
Copy link

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

@piyush-garg
Copy link

@sthaha @hrishin @arilivigni

I have tested this patch again, sorry for the delay

Test 1 - Jenkins boots
- works fine

Test 2 - Setup pipeline works
- creating an application resulting in a pipeline

Test 3 - cancel build from the openshift console works
- works fine

Test 4 - cancel build from the Jenkins console works
- works fine

Test 5 - PR results in a build
- works fine

Test 6 - PR merge results in a master build
- works fine

Test 7 - Pushing to master results in a build and that shows up on osio-pipeline as well
- works fine, intermittently once triggered two builds in Jenkins for a single commit but in osio and oso console shows only one

Test 8 - Start pipeline works
- start pipeline button works but it also resulted in intermittently triggering two builds in Jenkins for a single commit but in osio and oso console shows only one

Test 9 - Timer in the pipeline
- Time taken to complete a stage of the pipeline is shown differently on osio and osio console. After the completion of the stage, it showing same time perfectly.

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
- Jenkins idles, works fine

Test 11 - Promote abort button works after idling
- jenkins did not get idle if the build was stuck at approve/promote stage

I have tested with fabric8-pipeline-library

Thanks

@arilivigni
Copy link
Author

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

@sthaha
Copy link

sthaha commented Nov 21, 2018

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

@pradeepitm12
Copy link

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

@rupalibehera
Copy link
Member

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

15
Copy link
Member

Choose a reason for hiding this comment

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

why are we updating the version.txt I don't see any plugins updates in plugins.txt, am I missing something @piyush-garg , I saw you have asked @arilivigni above to do that.

Choose a reason for hiding this comment

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

Actually, previously there were some plugin updates but that got fixed with my PR #212 so no updates now.

@rupalibehera
Copy link
Member

rupalibehera commented Nov 26, 2018

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/Lots of config errors on jenkins startup openshiftio/openshift.io#2608]
  4. Also do not see plugin getting copying over again and again on every bootup of Jenkins [https://github.com/Jenkins moves plugins on every startup openshiftio/openshift.io#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
Copy link
Author

@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
Copy link

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

@fabric8cd
Copy link

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

@arilivigni
Copy link
Author

@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
Copy link

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

@fabric8cd
Copy link

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

@fabric8cd
Copy link

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

@arilivigni
Copy link
Author

@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

@arilivigni
Copy link
Author

Closing this since this tooling and service is a joke 🤣

@arilivigni arilivigni closed this Dec 9, 2020
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.

9 participants