Skip to content

Commit

Permalink
jenkins/papr: add custom jenkins imagestream
Browse files Browse the repository at this point in the history
In 3.6, we don't want to use the built-in `openshift/jenkins`
imagestream because that tracks the `:latest` tag in Docker Hub rather
than a versioned stable tag. This was done starting from v3.7. For now,
let's just create our own imagestream to point to the v3.9 tag.

See link in comments for more details.
  • Loading branch information
jlebon authored and cgwalters committed Apr 10, 2018
1 parent c47d9a9 commit 4a27aab
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
19 changes: 17 additions & 2 deletions jenkins/paci-jenkins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,22 @@ objects:
metadata:
name: paci-jenkins
namespace: ${NAMESPACE}
# this is a version of the openshift/jenkins locked to stable openshift tags,
# since we're using v3.6, which didn't do this versioning
# see: https://github.com/openshift/jenkins/issues/528#issuecomment-378381468
# Once we move away from v3.6, we can drop this and change the paci-jenkins bc
# to use the openshift/jenkins:2 tag
- apiVersion: v1
kind: ImageStream
metadata:
name: jenkins
namespace: ${NAMESPACE}
spec:
tags:
- name: stable
from:
kind: DockerImage
name: openshift/jenkins-2-centos7:v3.9
- apiVersion: v1
kind: BuildConfig
metadata:
Expand All @@ -41,8 +57,7 @@ objects:
sourceStrategy:
from:
kind: ImageStreamTag
name: jenkins:latest
namespace: openshift
name: jenkins:stable
forcePull: true
output:
to:
Expand Down
3 changes: 2 additions & 1 deletion papr/papr-trigger.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ def generate_papr_pod(args):
"name": "papr",
"image": "172.30.1.1:5000/projectatomic-ci/papr",
"imagePullPolicy": "Always",
"args": ["--debug", "--repo", args.repo],
"args": ["--debug", "runtest", "--conf",
"/etc/papr.conf", "--repo", args.repo],
# XXX: pvc for git checkout caches
# XXX: mount site.yaml configmap
"volumeMounts": [
Expand Down

0 comments on commit 4a27aab

Please sign in to comment.