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

[WIP]: Fix tag for output of jenkins master bc #32

Closed
wants to merge 1 commit into from

Conversation

dustymabe
Copy link
Member

The deployment is looking for jenkins:latest, not jenkins:2.

The deployment is looking for `jenkins:latest`, not `jenkins:2`.
@jlebon
Copy link
Member

jlebon commented Nov 29, 2018

Hmm, :2 should definitely work. This is used by the Jenkins template, which defaults to looking for jenkins:2. I matched the name so we didn't have to override another template var. See: https://github.com/openshift/jenkins/blob/ba1e4d95a104b948d80cf647ae27d693038f8e6f/openshift/templates/jenkins-persistent.json#L319

@dustymabe
Copy link
Member Author

looks like a mismatch in templates from what CentOS CI has and upstream.. In CentOS CI:

$ oc get template jenkins-persistent -n openshift -o yaml
...
- description: Name of the ImageStreamTag to be used for the Jenkins image.                                                                                                                                       
  displayName: Jenkins ImageStreamTag                                                                                                                                                                             
  name: JENKINS_IMAGE_STREAM_TAG                                                                                                                                                                                  
  value: jenkins:latest 
...

@jlebon
Copy link
Member

jlebon commented Nov 29, 2018

Hmm, indeed. That's odd. In that case, I don't mind changing it to jenkins:latest to match CentOS CI, but then we also need to update HACKING.md to make sure folks override JENKINS_IMAGE_STREAM_TAG locally.

Or maybe... to keep the local dev flow simpler, we keep it as jenkins:2 and update HACKING.md to make sure we override the variable if working with prod?

@jlebon
Copy link
Member

jlebon commented Nov 29, 2018

(Basically, given that the local workflow will be exercised much more often than the prod one, I'd rather we prioritized that one.)

@dustymabe
Copy link
Member Author

to keep the local dev flow simpler, we keep it as jenkins:2 and update HACKING.md to make sure we override the variable if working with prod?

yeah I think that makes sense.. we may even be able to write something that grabs the "default" from oc get template jenkins-persistent -n openshift -o json and sets that in the object using oc patch

@jlebon
Copy link
Member

jlebon commented Dec 3, 2018

@dustymabe Want to update this?

@dustymabe
Copy link
Member Author

@dustymabe Want to update this?

yeah. i'll pick it back up. been digging out from the notification backlog in my inbox. will do shortly.

@dustymabe dustymabe changed the title Fix tag for output of jenkins master bc [WIP]: Fix tag for output of jenkins master bc Dec 10, 2018
@dustymabe
Copy link
Member Author

marking as WIP

@jlebon jlebon mentioned this pull request Apr 29, 2019
@jlebon
Copy link
Member

jlebon commented Apr 29, 2019

This is now part of #53.

Both CentOS CI and a local oc cluster up do in fact still use jenkins:latest, so there's nothing else to change in fact.

AFAICT, v3.6 templates live here: https://github.com/openshift/openshift-ansible/blob/release-3.6/roles/openshift_examples/files/examples/v3.6/quickstart-templates/jenkins-persistent-template.json, which does have jenkins:latest: https://github.com/openshift/openshift-ansible/blob/17241ee23ddc1e299c065ed773e22c1b7299ef7d/roles/openshift_examples/files/examples/v3.6/quickstart-templates/jenkins-persistent-template.json#L302.

I updated the commit message to clarify the confusion here:

The deployment is looking for jenkins:latest, not jenkins:2. This
was changed in later releases of OpenShift to jenkins:2, but since
we're working with CentOS CI here, we need to match v3.6.

@jlebon jlebon closed this Apr 29, 2019
dustymabe added a commit to dustymabe/fedora-coreos-pipeline that referenced this pull request Jun 11, 2019
Update the docs so that we can be more compatible with latest templates.
We update the input ImageStreamTag for our jenkins deployment to match
latest openshift (`jenkins:2`)

related: coreos#32
dustymabe added a commit to dustymabe/fedora-coreos-pipeline that referenced this pull request Jun 11, 2019
Update the docs so that we can be more compatible with latest templates.
We update the input ImageStreamTag for our jenkins deployment to match
latest openshift (`jenkins:2`)

related: coreos#32
dustymabe added a commit to dustymabe/fedora-coreos-pipeline that referenced this pull request Jun 11, 2019
Update the docs so that we can be more compatible with latest templates.
We update the input ImageStreamTag for our jenkins deployment to match
latest openshift (`jenkins:2`)

related: coreos#32
dustymabe added a commit to dustymabe/fedora-coreos-pipeline that referenced this pull request Jun 11, 2019
Update the docs so that we can be more compatible with latest templates.
We update the input ImageStreamTag for our jenkins deployment to match
latest openshift (`jenkins:2`)

related: coreos#32
dustymabe added a commit to dustymabe/fedora-coreos-pipeline that referenced this pull request Jun 11, 2019
Update the docs so that we can be more compatible with latest templates.
We update the input ImageStreamTag for our Jenkins deployment to match
latest OpenShift (`jenkins:2`)

related: coreos#32
dustymabe added a commit to dustymabe/fedora-coreos-pipeline that referenced this pull request Jun 11, 2019
Update the docs so that we can be more compatible with latest templates.
We update the input ImageStreamTag for our Jenkins deployment to match
latest OpenShift (`jenkins:2`)

related: coreos#32
jlebon pushed a commit that referenced this pull request Jun 11, 2019
Update the docs so that we can be more compatible with latest templates.
We update the input ImageStreamTag for our Jenkins deployment to match
latest OpenShift (`jenkins:2`)

related: #32
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.

2 participants