Skip to content

Conversation

@jianzhangbjz
Copy link
Member

For now, we have to check if these images are downstream for each sub-team. I have intended to check the image labels, but I didn't find the related options. So, I added related checks steps in here. I'm not sure if it's appropriate for upstream. @sosiouxme @vikaslaad Could you help take a review? Thanks! cc: @scolange @bandrade @cuipinghuo @chengzhang1016 @dongboyan77 @zihantang-rh @emmajiafan

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 16, 2019
@jianzhangbjz
Copy link
Member Author

/test verify

1 similar comment
@jianzhangbjz
Copy link
Member Author

/test verify

Copy link
Contributor

@bparees bparees left a comment

Choose a reason for hiding this comment

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

couple nits, otherwise lgtm.

// log for debugging output before we ultimately fail
e2e.Logf("Pods found with invalid container images not present in release payload: %s", strings.Join(invalidPodContainerImages.List(), "\n"))
e2e.Logf("Pods found with invalid container image pull policy not equal to IfNotPresent: %s", strings.Join(invalidPodContainerImagePullPolicy.List(), "\n"))
e2e.Logf("Pods with invaild dowstream images: %s", strings.Join(invalidPodContainerDownstreamImages.List(), "\n"))
Copy link
Contributor

Choose a reason for hiding this comment

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

typo, invalid.

e2e.Failf("Pods found with invalid container image pull policy not equal to IfNotPresent: %s", strings.Join(invalidPodContainerImagePullPolicy.List(), "\n"))
}
if len(invalidPodContainerDownstreamImages) > 0 {
e2e.Failf("Pods with invaild dowstream images: %s", strings.Join(invalidPodContainerDownstreamImages.List(), "\n"))
Copy link
Contributor

Choose a reason for hiding this comment

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

typo, invalid

@bparees
Copy link
Contributor

bparees commented Jun 20, 2019

/approve

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 20, 2019
@jianzhangbjz
Copy link
Member Author

@bparees Many thanks! I have fixed it and squash these commits into one. Please help take a review, thanks!
This PR will check all components' images of OCP whether is downstream. cc @openshift/team-qe

continue
}
e2e.Logf("Image relase info:%s", result)
if !strings.Contains(result, "Red Hat Enterprise Linux Server") {
Copy link
Member

Choose a reason for hiding this comment

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

Not supporting RHEL CoreOS based images ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Not for now, I guess the release images have not based on the RHCOS yet. Correct me if I'm wrong. What do you think?@vikaslaad

Copy link
Contributor

Choose a reason for hiding this comment

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

the images this would be checking are all UBI based and I'd expect them to continue to be.

Copy link
Contributor

Choose a reason for hiding this comment

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

Inferring from @smarterclayton - will this continue to be the case if we run OKD CI and with Fedora CoreOS as the base?

Copy link
Contributor

Choose a reason for hiding this comment

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

fedora coreos would be the base for the nodes, not the container images which i would expect to continue to be UBI based. I'm not aware of any plans for a fedora equivalent of the UBI.

Copy link
Member Author

Choose a reason for hiding this comment

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

@bparees I'm sorry, what're the checkpoints of UBI based images? Do we have any special label when running UBI images?

Copy link
Contributor

Choose a reason for hiding this comment

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

we only run ubi images, there are no other images.

Copy link
Member Author

Choose a reason for hiding this comment

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

@bparees I guess checking the output of $ cat /etc/redhat-release is enough for identifying the UBI images, what do you think?

Copy link
Contributor

Choose a reason for hiding this comment

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

@jianzhangbjz i think it's fine for now, if it becomes a problem we can always revisit it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok, thanks!

}

// Run command without extra args
func (c *CLI) RunWithoutGlobalArgs(commands ...string) *CLI {
Copy link
Contributor

Choose a reason for hiding this comment

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

did you have to introduce this because Run appends --config and --namespace after the other args? If so, why not fix Run to append commands after the --config and --namespace instead of introducing a new function?

Copy link
Member Author

@jianzhangbjz jianzhangbjz Jun 23, 2019

Choose a reason for hiding this comment

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

The Run function will add the --config=xxx/--namespace=xxx on the end of the command. But, it inappropriate for some commands, for example, oc exec -n openshift-apiserver-operator openshift-apiserver-operator-59487cc4bf-7ws9q -c openshift-apiserver-operator -- cat /etc/redhat-release.
And, I also thought to change the Run function, but as you know, Golang doesn't support the default arguments. I worried the changes will impact other old invoking. So, I create a new one.
Or we can change the Run function to add --config=xxx/--namespace=xxx args at the begining of the commands. What do you suggest?

Copy link
Contributor

Choose a reason for hiding this comment

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

i would expect that adding it to the beginning should be fine and if it breaks a test it should be caught in CI as part of your PR.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok, thanks! I will modify the Run function instead of creating a new one.

Copy link

@anpingli anpingli Jun 26, 2019

Choose a reason for hiding this comment

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

@jianzhangbjz An aspect is the ubi base image have enabled some ubi repo by default.
sh-4.2$ yum repolist
repo id repo name status
ubi-7/x86_64 Red Hat Universal Base Image 7 Server (RPMs) 832
ubi-7-optional/x86_64 Red Hat Universal Base Image 7 Server - Optional (RPMs) 18
ubi-7-rhah/x86_64 Red Hat Universal Base Image Atomic Host (RPMs) 3
ubi-7-rhscl/x86_64 Red Hat Software Collections for Red Hat Universal Base Image 7 Server (RPMs)

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for your information! @anpingli Removed the RunWithoutGlobalArgs function. @bparees

@sosiouxme
Copy link
Member

@jianzhangbjz @bparees I'm sorry, I'm lacking context for what this is trying to accomplish, and can't quickly infer it from the code. When would this run, and what is it comparing to determine there's a mismatch between upstream and downstream? (What is the source of truth?)

I'm not sure it's relevant but there's a much-delayed effort to ensure consistency between upstream and downstream config: openshift/ci-operator-prowgen#121

@bparees
Copy link
Contributor

bparees commented Jun 26, 2019

@jianzhangbjz @bparees I'm sorry, I'm lacking context for what this is trying to accomplish, and can't quickly infer it from the code. When would this run, and what is it comparing to determine there's a mismatch between upstream and downstream? (What is the source of truth?)

i don't think it's comparing up/downstream. My assumptoin is that it's just trying to ensure all our images are UBI-rhel based, which today they should be. (and even w/ OKD i'm anticipating this will still be true)

@jianzhangbjz
Copy link
Member Author

@bparees I guess some images in OKD are based on centos, not rhel. What will trigger those tests which under test/extended/... folder? Or these extend tests will be run as default?

@bparees
Copy link
Contributor

bparees commented Jun 28, 2019

@bparees I guess some images in OKD are based on centos, not rhel. What will trigger those tests which under test/extended/... folder? Or these extend tests will be run as default?

Are you referring to things like the ruby/jenkins/python/mongodb/etc type images?

None of our product/infra images should be centos-based. so as long as you scope the pods you're checking to the openshift* type namespaces, it should not be a problem.

If you're seeing some failures due to containers using centos images, let's look at them specifically and decide the right approach.

@jianzhangbjz
Copy link
Member Author

@bparees Got it, thanks! Could you help review this PR and add the lgtm label? Thanks!

@jianzhangbjz
Copy link
Member Author

/retest

@bparees
Copy link
Contributor

bparees commented Jun 29, 2019

let's see if we can get passing tests first... (probably failed due to the CI issues, but i don't want to leave this retrying indefinitely if it's fundamentally broken).

/retest

@bparees bparees self-assigned this Jun 29, 2019
@bparees
Copy link
Contributor

bparees commented Jun 29, 2019

failures look unrelated to this pr.
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 29, 2019
@openshift-bot
Copy link
Contributor

/retest

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

5 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@bparees
Copy link
Contributor

bparees commented Jun 30, 2019 via email

@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 Jun 30, 2019
@bparees
Copy link
Contributor

bparees commented Jun 30, 2019

appears to be failing due to https://bugzilla.redhat.com/show_bug.cgi?id=1725478

will unhold when that is resolved, until then this won't be able to merge.

@bparees
Copy link
Contributor

bparees commented Jul 1, 2019

/hold cancel
/retest

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 1, 2019
@openshift-bot
Copy link
Contributor

/retest

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

4 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 1, 2019
@openshift-ci-robot openshift-ci-robot removed lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 2, 2019
@jianzhangbjz
Copy link
Member Author

Rebase it to solve the conflicts, could you help add the lgtm label again? Thanks! @bparees

@bparees
Copy link
Contributor

bparees commented Jul 2, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 2, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, jianzhangbjz

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

The pull request process is described here

Details 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

@openshift-merge-robot openshift-merge-robot merged commit 29359bd into openshift:master Jul 2, 2019
@jianzhangbjz jianzhangbjz deleted the downstream-olm branch July 2, 2019 09:42
@p0lyn0mial
Copy link
Contributor

FYI this test is extremely unstable (for example #24305). I am going to disable it.

@bparees
Copy link
Contributor

bparees commented Dec 17, 2019

@p0lyn0mial for any test you disable please create a BZ to track getting it re-enabled.

@bparees
Copy link
Contributor

bparees commented Dec 17, 2019

@p0lyn0mial also please link to the failing job, not your PR, to illustrate the issue.

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.

10 participants