Skip to content

Conversation

@wking
Copy link
Member

@wking wking commented Jun 10, 2020

This collects similar workflow definitions together instead of having a growing dump of sibling directories.

CCing affected approvers: @danwinship, @dcbw, @ingvagabund, @knobunc, @pecameron, @squeed

@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 10, 2020
wking added 2 commits June 10, 2020 16:19
This collects similar workflow definitions together instead of having
a growing dump of sibling directories.

Also use symlinks to parent OWNERS files for subdirectories had the
same content.  I haven't used symlinks for things like:

* aws/ovn/OWNERS
* vsphere/ovn/OWNERS

despite them having the same content, because it's not clear which
location would be more canonical.  Will be nice if/when [1] gets fixed
and we can go back to using aliases.

[1]: openshift/ci-tools#115 (comment)
Keeping all the gather logic collected under one step subdirectory.
@wking wking force-pushed the organize-e2e-steps branch from 513c8f0 to e0f511e Compare June 10, 2020 23:24
@openshift-ci-robot
Copy link
Contributor

@wking: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/rehearse/openshift/cluster-network-operator/master/e2e-vsphere e0f511e link /test pj-rehearse
ci/rehearse/openshift/cluster-network-operator/master/e2e-aws-sdn-single e0f511e link /test pj-rehearse
ci/prow/pj-rehearse e0f511e link /test pj-rehearse
ci/rehearse/openshift/cluster-network-operator/master/e2e-ovn-hybrid-step-registry e0f511e link /test pj-rehearse

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@wking
Copy link
Member Author

wking commented Jun 11, 2020

ovn-hybrid hung in the e2e-ovn-hybrid-step-registry-openshift-e2e-test step. sdn-single failed:

[sig-cli] Kubectl Port forwarding With a server listening on 0.0.0.0 that expects a client request should support a client that connects, sends DATA, and disconnects [Suite:openshift/conformance/parallel] [Suite:k8s]

with the hilarious:

fail [k8s.io/kubernetes/test/e2e/kubectl/portforward.go:342]: Jun 11 01:50:39.821: Expected "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" from server, got "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"

vsphere failed a bunch of tests on a Kube-API-server flake, with errors like:

Get https://api.ci-op-d59mvpkj-1e73e.origin-ci-int-aws.dev.rhcloud.com:6443/api/v1/nodes?fieldSelector=spec.unschedulable%3Dfalse&resourceVersion=0: dial tcp 139.178.94.140:6443: i/o timeout

But all of those look like valid product issues. I don't see anything that looks related to the changes I'm making in this PR, so we should be good to merge.

@ingvagabund
Copy link
Member

I don't have any strong opinion about the directories layout. More up to the step registry architects to say yes/no based on their design.

@abhinavdahiya
Copy link
Contributor

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, wking

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-ci-robot
Copy link
Contributor

@wking: Updated the following 2 configmaps:

  • step-registry configmap in namespace ci at cluster app.ci using the following files:
    • key OWNERS using file ``
    • key OWNERS using file ci-operator/step-registry/gather/network/OWNERS
    • key gather-network-chain.yaml using file ``
    • key gather-network-chain.yaml using file ci-operator/step-registry/gather/network/gather-network-chain.yaml
    • key gather-network-commands.sh using file ``
    • key gather-network-commands.sh using file ci-operator/step-registry/gather/network/gather-network-commands.sh
    • key gather-network-ref.yaml using file ``
    • key gather-network-ref.yaml using file ci-operator/step-registry/gather/network/gather-network-ref.yaml
    • key OWNERS using file ``
    • key OWNERS using file ``
    • key OWNERS using file ``
    • key OWNERS using file ci-operator/step-registry/openshift/e2e/aws/loki/OWNERS
    • key openshift-e2e-aws-loki-workflow.yaml using file ``
    • key openshift-e2e-aws-loki-workflow.yaml using file ci-operator/step-registry/openshift/e2e/aws/loki/openshift-e2e-aws-loki-workflow.yaml
    • key OWNERS using file ``
    • key OWNERS using file ci-operator/step-registry/openshift/e2e/aws/ovn/OWNERS
    • key OWNERS using file ci-operator/step-registry/openshift/e2e/aws/ovn/hybrid/OWNERS
    • key openshift-e2e-aws-ovn-hybrid-workflow.yaml using file ``
    • key openshift-e2e-aws-ovn-hybrid-workflow.yaml using file ci-operator/step-registry/openshift/e2e/aws/ovn/hybrid/openshift-e2e-aws-ovn-hybrid-workflow.yaml
    • key openshift-e2e-aws-ovn-workflow.yaml using file ``
    • key openshift-e2e-aws-ovn-workflow.yaml using file ci-operator/step-registry/openshift/e2e/aws/ovn/openshift-e2e-aws-ovn-workflow.yaml
    • key OWNERS using file ``
    • key OWNERS using file ci-operator/step-registry/openshift/e2e/aws/sdn/OWNERS
    • key OWNERS using file ci-operator/step-registry/openshift/e2e/aws/sdn/multi/OWNERS
    • key openshift-e2e-aws-sdn-multi-workflow.yaml using file ``
    • key openshift-e2e-aws-sdn-multi-workflow.yaml using file ci-operator/step-registry/openshift/e2e/aws/sdn/multi/openshift-e2e-aws-sdn-multi-workflow.yaml
    • key OWNERS using file ci-operator/step-registry/openshift/e2e/aws/sdn/single/OWNERS
    • key openshift-e2e-aws-sdn-single-workflow.yaml using file ``
    • key openshift-e2e-aws-sdn-single-workflow.yaml using file ci-operator/step-registry/openshift/e2e/aws/sdn/single/openshift-e2e-aws-sdn-single-workflow.yaml
    • key OWNERS using file ``
    • key OWNERS using file ci-operator/step-registry/openshift/e2e/vsphere/ovn/OWNERS
    • key openshift-e2e-vsphere-ovn-workflow.yaml using file ``
    • key openshift-e2e-vsphere-ovn-workflow.yaml using file ci-operator/step-registry/openshift/e2e/vsphere/ovn/openshift-e2e-vsphere-ovn-workflow.yaml
  • step-registry configmap in namespace ci at cluster api.ci using the following files:
    • key OWNERS using file ``
    • key OWNERS using file ci-operator/step-registry/gather/network/OWNERS
    • key gather-network-chain.yaml using file ``
    • key gather-network-chain.yaml using file ci-operator/step-registry/gather/network/gather-network-chain.yaml
    • key gather-network-commands.sh using file ``
    • key gather-network-commands.sh using file ci-operator/step-registry/gather/network/gather-network-commands.sh
    • key gather-network-ref.yaml using file ``
    • key gather-network-ref.yaml using file ci-operator/step-registry/gather/network/gather-network-ref.yaml
    • key OWNERS using file ``
    • key OWNERS using file ``
    • key OWNERS using file ``
    • key OWNERS using file ci-operator/step-registry/openshift/e2e/aws/loki/OWNERS
    • key openshift-e2e-aws-loki-workflow.yaml using file ``
    • key openshift-e2e-aws-loki-workflow.yaml using file ci-operator/step-registry/openshift/e2e/aws/loki/openshift-e2e-aws-loki-workflow.yaml
    • key OWNERS using file ``
    • key OWNERS using file ci-operator/step-registry/openshift/e2e/aws/ovn/OWNERS
    • key OWNERS using file ci-operator/step-registry/openshift/e2e/aws/ovn/hybrid/OWNERS
    • key openshift-e2e-aws-ovn-hybrid-workflow.yaml using file ``
    • key openshift-e2e-aws-ovn-hybrid-workflow.yaml using file ci-operator/step-registry/openshift/e2e/aws/ovn/hybrid/openshift-e2e-aws-ovn-hybrid-workflow.yaml
    • key openshift-e2e-aws-ovn-workflow.yaml using file ``
    • key openshift-e2e-aws-ovn-workflow.yaml using file ci-operator/step-registry/openshift/e2e/aws/ovn/openshift-e2e-aws-ovn-workflow.yaml
    • key OWNERS using file ``
    • key OWNERS using file ci-operator/step-registry/openshift/e2e/aws/sdn/OWNERS
    • key OWNERS using file ci-operator/step-registry/openshift/e2e/aws/sdn/multi/OWNERS
    • key openshift-e2e-aws-sdn-multi-workflow.yaml using file ``
    • key openshift-e2e-aws-sdn-multi-workflow.yaml using file ci-operator/step-registry/openshift/e2e/aws/sdn/multi/openshift-e2e-aws-sdn-multi-workflow.yaml
    • key OWNERS using file ci-operator/step-registry/openshift/e2e/aws/sdn/single/OWNERS
    • key openshift-e2e-aws-sdn-single-workflow.yaml using file ``
    • key openshift-e2e-aws-sdn-single-workflow.yaml using file ci-operator/step-registry/openshift/e2e/aws/sdn/single/openshift-e2e-aws-sdn-single-workflow.yaml
    • key OWNERS using file ``
    • key OWNERS using file ci-operator/step-registry/openshift/e2e/vsphere/ovn/OWNERS
    • key openshift-e2e-vsphere-ovn-workflow.yaml using file ``
    • key openshift-e2e-vsphere-ovn-workflow.yaml using file ci-operator/step-registry/openshift/e2e/vsphere/ovn/openshift-e2e-vsphere-ovn-workflow.yaml
Details

In response to this:

This collects similar workflow definitions together instead of having a growing dump of sibling directories.

CCing affected approvers: @danwinship, @dcbw, @ingvagabund, @knobunc, @pecameron, @squeed

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@wking wking deleted the organize-e2e-steps branch June 17, 2020 20:33
wking added a commit to wking/openshift-release that referenced this pull request Jun 17, 2020
Step-registry CI currently requires each directory to contain an
OWNERS file (ci/prow/owners).  Often, those OWNERS sets are the same
as the parent-directory's OWNERS file.  To ease maintenance, we can
use symlinks to ../OWNERS to explicitly say "this is the same set", as
we started to do in 0f27f00 (ci-operator/step-registry/openshift:
Push e2e flavors under e2e/, 2020-06-10, openshift#9612).  This commit adds a
script to automate that deduping, and also commits the state generated
by:

  $ hack/dedup-owners.sh ci-operator/step-registry
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants