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

add image refs, env vars, so we can get jenkins images from payload #85

Merged
merged 2 commits into from
Jan 30, 2019

Conversation

gabemontero
Copy link
Contributor

/assign @bparees

ptal to review at least the yaml/ref stuff

in theory we could just merge this, but ideally I can wire in the processing of the new env's in the samples operator code with this PR as well

I'd like to start on those after #81

@gabemontero gabemontero added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 23, 2019
@openshift-ci-robot openshift-ci-robot removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jan 23, 2019
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 23, 2019
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 23, 2019
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 23, 2019
@bparees
Copy link
Contributor

bparees commented Jan 23, 2019

@gabemontero it looks correct to me.

@gabemontero
Copy link
Contributor Author

/retest

@gabemontero
Copy link
Contributor Author

ah ... I need to wait until the mirroring for jenkins-agent-base completes:

error: unable to create a release: operator "cluster-samples-operator" failed to map images: image file "/tmp/release-image-0.0.1-2019-01-23-165028825421902/cluster-samples-operator/image-references" referenced image "jenkins-agent-base" that is not part of the input images

@gabemontero
Copy link
Contributor Author

updated for openshift/release#2678 @bparees

deploy/05-operator.yaml Outdated Show resolved Hide resolved
deploy/image-references Outdated Show resolved Hide resolved
@bparees
Copy link
Contributor

bparees commented Jan 23, 2019

image refs/envs look ok to me again

@bparees
Copy link
Contributor

bparees commented Jan 23, 2019

@gabemontero i'd be ok merging this now so we can start seeing if the env vars show up properly on the samples operator. May make it easier for you to iterate on the next steps later when the cluster is populating the payload correctly out of the box.

@bparees
Copy link
Contributor

bparees commented Jan 23, 2019

but i think we are supposed to wait on this until the OCP side of the payload is ready which it is not yet.

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 23, 2019
@bparees
Copy link
Contributor

bparees commented Jan 23, 2019

discussion of the next step to get it into the OCP payload:
https://coreos.slack.com/archives/CB95J6R4N/p1548279126559100

@gabemontero
Copy link
Contributor Author

Just logged into api.ci:

gmontero ~ $ oc get imagestreamtags -n ocp | grep jenkins
4.0-art-latest:jenkins-agent-base                                                quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:34bee5e74cf36e668c529707b6853b0773d51d1cb71dab484518ca7ae2816bc3                          12 hours ago
4.0-art-latest:jenkins                                                           quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80c323c8f604bf181a5ccfbe5090884422b77eb37c35910bfa7cb2a07ff922c5                          24 hours ago
4.0-art-latest:jenkins-agent-nodejs                                              quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e26e31dd5cdd2a06cf8f5f58a3c91a382ca02544edbc650c304edd09b09f7d18                          24 hours ago
4.0-art-latest:jenkins-agent-maven                                               quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bfd518c253b986ac5640862110ce38e239cecf3b136ef370b568f1acc86eab5                          24 hours ago
4.0-art-latest:jenkins-2-rhel7                                                   quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6dc87ecd037515989f9620efbdb27254e3ea358c405b909d1335b240538b3e63                          29 hours ago
4.0-art-latest-2019-01-24-034425:jenkins-agent-maven                             quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bfd518c253b986ac5640862110ce38e239cecf3b136ef370b568f1acc86eab5                          23 hours ago
4.0-art-latest-2019-01-24-034425:jenkins-2-rhel7                                 quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6dc87ecd037515989f9620efbdb27254e3ea358c405b909d1335b240538b3e63                          23 hours ago
4.0-art-latest-2019-01-24-034425:jenkins                                         quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80c323c8f604bf181a5ccfbe5090884422b77eb37c35910bfa7cb2a07ff922c5                          23 hours ago
4.0-art-latest-2019-01-24-034425:jenkins-agent-nodejs                            quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e26e31dd5cdd2a06cf8f5f58a3c91a382ca02544edbc650c304edd09b09f7d18                          23 hours ago
4.0-art-latest-2019-01-24-034425:jenkins-agent-base                              quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2f9a1bae934e2f84e7bd6c6444f2e3bbd1afbe8e9bca1704dad586d66610662                          23 hours ago
4.0-art-latest-2019-01-24-045353:jenkins-agent-base                              quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2f9a1bae934e2f84e7bd6c6444f2e3bbd1afbe8e9bca1704dad586d66610662                          22 hours ago
4.0-art-latest-2019-01-24-045353:jenkins-2-rhel7                                 quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6dc87ecd037515989f9620efbdb27254e3ea358c405b909d1335b240538b3e63                          22 hours ago
4.0-art-latest-2019-01-24-045353:jenkins-agent-maven                             quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bfd518c253b986ac5640862110ce38e239cecf3b136ef370b568f1acc86eab5                          22 hours ago
4.0-art-latest-2019-01-24-045353:jenkins-agent-nodejs                            quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e26e31dd5cdd2a06cf8f5f58a3c91a382ca02544edbc650c304edd09b09f7d18                          22 hours ago
4.0-art-latest-2019-01-24-045353:jenkins                                         quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80c323c8f604bf181a5ccfbe5090884422b77eb37c35910bfa7cb2a07ff922c5                          22 hours ago
4.0-art-latest-2019-01-24-054933:jenkins                                         quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80c323c8f604bf181a5ccfbe5090884422b77eb37c35910bfa7cb2a07ff922c5                          21 hours ago
4.0-art-latest-2019-01-24-054933:jenkins-agent-maven                             quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bfd518c253b986ac5640862110ce38e239cecf3b136ef370b568f1acc86eab5                          21 hours ago
4.0-art-latest-2019-01-24-054933:jenkins-2-rhel7                                 quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6dc87ecd037515989f9620efbdb27254e3ea358c405b909d1335b240538b3e63                          21 hours ago
4.0-art-latest-2019-01-24-054933:jenkins-agent-base                              quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2f9a1bae934e2f84e7bd6c6444f2e3bbd1afbe8e9bca1704dad586d66610662                          21 hours ago
4.0-art-latest-2019-01-24-054933:jenkins-agent-nodejs                            quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e26e31dd5cdd2a06cf8f5f58a3c91a382ca02544edbc650c304edd09b09f7d18                          21 hours ago
4.0-art-latest-2019-01-24-144623:jenkins-2-rhel7                                 quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6dc87ecd037515989f9620efbdb27254e3ea358c405b909d1335b240538b3e63                          12 hours ago
4.0-art-latest-2019-01-24-144623:jenkins-agent-maven                             quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bfd518c253b986ac5640862110ce38e239cecf3b136ef370b568f1acc86eab5                          12 hours ago
4.0-art-latest-2019-01-24-144623:jenkins                                         quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80c323c8f604bf181a5ccfbe5090884422b77eb37c35910bfa7cb2a07ff922c5                          12 hours ago
4.0-art-latest-2019-01-24-144623:jenkins-agent-nodejs                            quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e26e31dd5cdd2a06cf8f5f58a3c91a382ca02544edbc650c304edd09b09f7d18                          12 hours ago
4.0-art-latest-2019-01-24-144623:jenkins-agent-base                              quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:34bee5e74cf36e668c529707b6853b0773d51d1cb71dab484518ca7ae2816bc3                          12 hours ago
4.0-art-latest-2019-01-24-184525:jenkins                                         quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80c323c8f604bf181a5ccfbe5090884422b77eb37c35910bfa7cb2a07ff922c5                          8 hours ago
4.0-art-latest-2019-01-24-184525:jenkins-2-rhel7                                 quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6dc87ecd037515989f9620efbdb27254e3ea358c405b909d1335b240538b3e63                          8 hours ago
4.0-art-latest-2019-01-24-184525:jenkins-agent-nodejs                            quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e26e31dd5cdd2a06cf8f5f58a3c91a382ca02544edbc650c304edd09b09f7d18                          8 hours ago
4.0-art-latest-2019-01-24-184525:jenkins-agent-base                              quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:34bee5e74cf36e668c529707b6853b0773d51d1cb71dab484518ca7ae2816bc3                          8 hours ago
4.0-art-latest-2019-01-24-184525:jenkins-agent-maven                             quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bfd518c253b986ac5640862110ce38e239cecf3b136ef370b568f1acc86eab5                          8 hours ago
4.0-art-latest-2019-01-25-025346:jenkins                                         quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80c323c8f604bf181a5ccfbe5090884422b77eb37c35910bfa7cb2a07ff922c5                          17 minutes ago
4.0-art-latest-2019-01-25-025346:jenkins-agent-maven                             quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bfd518c253b986ac5640862110ce38e239cecf3b136ef370b568f1acc86eab5                          17 minutes ago
4.0-art-latest-2019-01-25-025346:jenkins-2-rhel7                                 quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6dc87ecd037515989f9620efbdb27254e3ea358c405b909d1335b240538b3e63                          17 minutes ago
4.0-art-latest-2019-01-25-025346:jenkins-agent-base                              quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:34bee5e74cf36e668c529707b6853b0773d51d1cb71dab484518ca7ae2816bc3                          17 minutes ago
4.0-art-latest-2019-01-25-025346:jenkins-agent-nodejs                            quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e26e31dd5cdd2a06cf8f5f58a3c91a382ca02544edbc650c304edd09b09f7d18                          17 minutes ago
gmontero ~ $ 

Not sure how to decipher the oc get is -n ocp 4.0 -o yaml output

going to retest and see

@gabemontero
Copy link
Contributor Author

/retest

@bparees
Copy link
Contributor

bparees commented Jan 25, 2019

the test won't tell you anything because it doesn't build an OCP payload.

the oc get is -n ocp 4.0 -o yaml output should show you if there are jenkins/jenkins-agent-* tags in the imagestream or not, same as the oc get is -n openshift origin-v4.0 output.

@bparees
Copy link
Contributor

bparees commented Jan 25, 2019

I do not see the jenkins images in the ocp imagestream, so you'll have to bug @joeldavis84 or @tbielawa to see what we've missed in terms of getting the new jenkins images built+published for ocp.

@gabemontero
Copy link
Contributor Author

/retest

@gabemontero
Copy link
Contributor Author

gabemontero commented Jan 28, 2019

The actual image job failure is:

error: unable to create a release: operator "cluster-samples-operator" failed to map images: image file "/tmp/release-image-0.0.1-2019-01-27-233602745791962/cluster-samples-operator/image-references" referenced image "jenkins-nodejs-agent" that is not part of the input images

notice the jenkins-nodejs-agent vs. jenkins-agent-nodejs ... there was some naming back and forth with this. It used to be the former, but is suppose to be the latter.

All the references in this PR are of the ..agent-nodejs.. form. And the file https://github.com/openshift/release/blob/master/ci-operator/config/openshift/jenkins/openshift-jenkins-master__rhel.yaml also shares that pattern.

In fact, there are no references to jenkins-nodejs-agent in the entire https://github.com/openshif/release repo.

Perhaps something was set up in dist git / osbs land when the name was jenkins-nodejs-agent ?

@joeldavis84 @tbielawa does that provide any clues?

Or maybe that is a red herring ....

@gabemontero
Copy link
Contributor Author

@bparees yeah, I see those ist's now in the ocp namespace (appear to have been there since Jan 24:

gmontero ~/go/src/github.com/openshift/release  (master)$ oc get imagestreamtags -n ocp | grep jenkins
4.0-art-latest:jenkins-agent-maven                                               quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e3d25d299cb437862d55266ba5ff782e101fe46479ae2b0664965f20aca50c4                          2 days ago
4.0-art-latest:jenkins-agent-nodejs                                              quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c76ed9d6fd59e9b6e4c6e9a71d87bb10a29562a14a453c25fe34cea46e0eb9cd                          2 days ago
4.0-art-latest:jenkins-agent-base                                                quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:702bf0228ff662cd43ce26f7ee35f4b7ecb30aaf4e8b95c46b52a300701c1e48                          2 days ago
4.0-art-latest:jenkins                                                           quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ca6e2558ebe419ed61a264f2c99f51015b2d041acce906c867dce538f0fcdd6                          2 days ago
4.0-art-latest:jenkins-2-rhel7                                                   quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6dc87ecd037515989f9620efbdb27254e3ea358c405b909d1335b240538b3e63                          4 days ago

I would think the naming issue I noted above is the smoking guy currently.

@bparees
Copy link
Contributor

bparees commented Jan 28, 2019

it's not just that they need to be in the ocp namespace, they need to be part of the "4.0" imagestream.

oc get is 4.0 -n ocp -o yaml

if you look in that imagestream (named "4.0") you will see tags for all the other OCP payload images.

It is supposed to be the equivalent to the "origin-v4.0" imagestream in the "openshift" namespace:

oc get is origin-v4.0 -n openshift -o yaml | grep -i jenkins
    name: jenkins
    name: jenkins-agent-base
    name: jenkins-agent-maven
    name: jenkins-agent-nodejs
    tag: jenkins
    tag: jenkins-agent-base
    tag: jenkins-agent-maven
    tag: jenkins-agent-nodejs

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gabemontero

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

1 similar comment
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gabemontero

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@gabemontero
Copy link
Contributor Author

ok @bparees showed me what I was overlooking/blind to in my image ref file ... pushed update ... will confirm if we at least get past that and get to what @bparees has been noting re: the ocp image stream

@gabemontero
Copy link
Contributor Author

In the failed image eco run, the machine-config-operator did not reach availability in time ; I saw http level error messages in its pod logs

@gabemontero
Copy link
Contributor Author

from @bparees on slack: things look good re: ocp ... needed to look at oc get is 4.0-art-latest -n ocp -o yaml

@gabemontero
Copy link
Contributor Author

/retest

@gabemontero
Copy link
Contributor Author

gabemontero commented Jan 29, 2019

@bparees this still needs to hold until the other PRs merge, but this is reviewable in that

a) the changes do not collide with #81
b) currently assumes that the OKD choice is "going away" :-) ... I could add qualifiers to only tag in the payload with OCP if we want ... but for now I have it up as the simpler change

ptal

@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 29, 2019
case imagestream.Name == "jenkins-agent-maven":
imagestream = tagInPayload("v4.0", "IMAGE_AGENT_MAVEN", imagestream)
case imagestream.Name == "jenkins-agent-nodejs":
imagestream = tagInPayload("v4.0", "IMAGE_AGENT_NODEJS", imagestream)
Copy link
Contributor

Choose a reason for hiding this comment

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

i debated whether to put the "v4.0" tag in the imagestream or just use latest...prior experience told me we'll probably want the flexibility of introducing a new version at some point, but it's something to think about as we move forward, we can revisit this choice up until GA.

@bparees
Copy link
Contributor

bparees commented Jan 29, 2019

@gabemontero this looks fine... i'm not actually sure there's any reason to hold it? All this logic should be ok on its own right?

obviously the agent related bits won't do anything, but this will get us using the master image from the payload, right? (maybe this PR should also remove the jenkins specific centos logic you added?)

@gabemontero
Copy link
Contributor Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Jan 29, 2019
@gabemontero gabemontero added the lgtm Indicates that a PR is ready to be merged. label Jan 29, 2019
@gabemontero
Copy link
Contributor Author

you convinced me @bparees .... placed on the merge queue

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@gabemontero
Copy link
Contributor Author

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 7b09ca3 into openshift:master Jan 30, 2019
@gabemontero gabemontero deleted the image-ref branch January 30, 2019 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants