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.

Sign up for GitHub

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

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5aa40dc
Switch to using upstream Jenkins Master
Oct 31, 2018
5282f7b
Switch to using upstream Jenkins Master
Oct 31, 2018
51649d8
Switch to using upstream Jenkins Master
Oct 31, 2018
3bdaa49
Switch to using upstream Jenkins Master
Oct 31, 2018
a52c69f
Merge branch 'master' of https://github.com/fabric8io/openshift-jenki…
Oct 31, 2018
04342f1
Bump number from 12 to 14 for version
Oct 31, 2018
38c6a75
Add blueocean, pipeline, worflow plugins
Nov 1, 2018
eaf7f8e
Update blueocean and kubernetes plugin
Nov 1, 2018
d8b7e5f
switch to kubernetes:1.12.0 plugin for compat purposes
Nov 1, 2018
112511f
See if we can remove blueocean altogether
Nov 1, 2018
ec6fc9a
Install blueocean 1.5.0
Nov 2, 2018
30bb248
Sync plugins and increase the version to 15
Nov 7, 2018
80c7837
Merge branch 'master' into master
arilivigni Nov 7, 2018
54f3a85
Sync plugins and increase the version to 15
Nov 14, 2018
e7d236e
Merge branch 'master' into master
arilivigni Nov 29, 2018
33bfdc5
Added vsphere-cloud plugin
Nov 29, 2018
f8f7c13
Merge branch 'master' into master
arilivigni Dec 11, 2018
b825c90
Test openshift-login.jpi custom plugin
Dec 11, 2018
44f0054
Merge remote-tracking branch 'origin/master'
Dec 11, 2018
6061c41
Switch back to original login plugin
Dec 26, 2018
4ae49ea
Merge branch 'master' into master
arilivigni Dec 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .cico/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
#
# This is automatically updated by fabric8-jenkins/jenkins-openshift-base
# at merge time via a PR but you can always modify it manually for fun and giggles.
BASE_IMAGE_VERSION="v95933d9"
BASE_IMAGE_NAMESPACE='openshift/jenkins-2-centos7'
BASE_IMAGE_VERSION="v4.0"

set -ex

Expand Down Expand Up @@ -58,7 +59,7 @@ function build() {
local snapshotImageName="fabric8/jenkins-openshift:SNAPSHOT-PR-${ghprbPullId}-${BUILD_ID}"
local message="Good news @${ghprbPullAuthorLogin} snapshot Jenkins image is available. \`docker pull ${snapshotImageName}\`"

s2i build . fabric8/jenkins-openshift-base:${BASE_IMAGE_VERSION} ${snapshotImageName} --copy
s2i build . ${BASE_IMAGE_NAMESPACE}:${BASE_IMAGE_VERSION} ${snapshotImageName} --copy

docker push ${snapshotImageName}

Expand All @@ -67,7 +68,7 @@ function build() {

function deploy() {
local newVersion="v$(git rev-parse --short ${GIT_COMMIT})"
s2i build . fabric8/jenkins-openshift-base:${BASE_IMAGE_VERSION} \
s2i build . ${BASE_IMAGE_NAMESPACE}:${BASE_IMAGE_VERSION} \
fabric8/jenkins-openshift:${newVersion} --copy

docker push fabric8/jenkins-openshift:${newVersion}
Expand Down
7 changes: 4 additions & 3 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ def repo = 'openshift-jenkins-s2i-config'
def org = 'fabric8io'
def project = org + '/' + repo
def flow = new io.fabric8.Fabric8Commands()
def baseImageVerion = "v0072490"
def baseImageNameSpace = "openshift/jenkins-2-centos7"
def baseImageVerion = "v4.0"
def deploySnapshot = false
def pipeline
def snapshotImageName
Expand All @@ -18,7 +19,7 @@ dockerTemplate{
snapshotImageName = "fabric8/jenkins-openshift:SNAPSHOT-${env.BRANCH_NAME}-${env.BUILD_NUMBER}"
stage ('build'){
container('s2i') {
sh "s2i build . fabric8/jenkins-openshift-base:${baseImageVerion} ${snapshotImageName} --copy"
sh "s2i build . ${baseImageNameSpace}:${baseImageVerion} ${snapshotImageName} --copy"
}
}

Expand Down Expand Up @@ -52,7 +53,7 @@ dockerTemplate{

stage ('s2i build'){
container('s2i') {
sh "s2i build . fabric8/jenkins-openshift-base:${baseImageVerion} fabric8/jenkins-openshift:${newVersion} --copy"
sh "s2i build . ${baseImageNameSpace}:${baseImageVerion} fabric8/jenkins-openshift:${newVersion} --copy"
}
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14
14
Copy link

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.