Skip to content

Comments

gather: support overriding image for disconnected environments#18414

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
stbenjam:gather-fix
May 7, 2021
Merged

gather: support overriding image for disconnected environments#18414
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
stbenjam:gather-fix

Conversation

@stbenjam
Copy link
Member

@stbenjam stbenjam commented May 7, 2021

Prior to 4.8, must-gather tries to access the internet on disconnected
environments. This change adds support for the steps that run
must-gather to support reading a must-gather-image.sh file from the
shared directory to override which image to use.

Baremetal disconnected will populate this file with the locally hosted
image when working on a release older than 4.8.

4.7 jobs are failing on the gather steps: https://prow.ci.openshift.org/view/gs/origin-ci-test/logs/periodic-ci-openshift-release-master-nightly-4.7-e2e-metal-ipi-ovn-ipv6/1390628216200237056

@openshift-ci openshift-ci bot requested review from crawford and derekhiggins May 7, 2021 14:20
Prior to 4.8, must-gather tries to access the internet on disconnected
environments. This changes adds support for the steps that run
must-gather to support reading a must-gather-image.sh file from the
shared directory to override which image to use.

Baremetal disconnected will populate this file with the locally hosted
image when working on a release older than 4.8.
@smarterclayton
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 7, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 7, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: smarterclayton, stbenjam

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 7, 2021
# without specifying an image to use. This looks at the release payload,
# and generates the pullspec for the must-gather in our mirrored
# registry.
OPENSHIFT_VERSION=\$(openshift_version)
Copy link
Contributor

Choose a reason for hiding this comment

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

What about sourcing ds-var.conf and using DS_OPENSHIFT_VERSION and DS_REGISTRY as in

if printf '%s\n%s' "4.8" "${DS_OPENSHIFT_VERSION}" | sort -C -V; then
? The file should be available at this stage

Copy link
Member Author

@stbenjam stbenjam May 7, 2021

Choose a reason for hiding this comment

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

That's probably fine but maybe do it as a follow-up? Let's get 4.7 unblocked today. This gather bash works and we've been using it for more than a year in dev-scripts.

@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.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 7, 2021

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

Test name Commit Details Rerun command
ci/rehearse/openshift/cluster-network-operator/release-4.9/e2e-azure-ovn-dualstack 421958d link /test pj-rehearse
ci/rehearse/openshift/installer/release-4.9/e2e-aws-shared-vpc 421958d link /test pj-rehearse
ci/rehearse/openshift/origin/release-4.1/e2e-aws-builds 421958d link /test pj-rehearse
ci/rehearse/openshift/machine-config-operator/release-4.5/e2e-ovirt 421958d link /test pj-rehearse
ci/rehearse/openshift/installer/release-4.9/e2e-gcp-upi 421958d link /test pj-rehearse
ci/rehearse/openshift/cluster-network-operator/release-4.9/e2e-ovn-ipsec-step-registry 421958d link /test pj-rehearse
ci/rehearse/openshift/ovn-kubernetes/release-4.9/e2e-aws-ovn 421958d link /test pj-rehearse
ci/rehearse/openshift/installer/release-4.9/e2e-gcp-upi-xpn 421958d link /test pj-rehearse
ci/rehearse/openshift/router/release-4.9/e2e-agnostic 421958d link /test pj-rehearse
ci/rehearse/openshift/machine-config-operator/release-4.9/e2e-gcp-single-node 421958d link /test pj-rehearse
ci/rehearse/openshift/origin/release-4.9/e2e-aws-disruptive 421958d link /test pj-rehearse
ci/rehearse/openshift/ovn-kubernetes/release-4.9/e2e-gcp-ovn 421958d link /test pj-rehearse
ci/rehearse/openshift/mdns-publisher/release-4.9/e2e-openstack-ipi 421958d link /test pj-rehearse
ci/rehearse/openshift/installer/release-4.9/e2e-azure-shared-vpc 421958d link /test pj-rehearse
ci/rehearse/openshift/ovn-kubernetes/release-4.9/e2e-azure-ovn 421958d link /test pj-rehearse
ci/rehearse/openshift/cluster-logging-operator/tech-preview/e2e-operator 421958d link /test pj-rehearse
ci/rehearse/operator-framework/operator-marketplace/release-4.9/e2e-aws-upgrade 421958d link /test pj-rehearse
ci/rehearse/operator-framework/operator-marketplace/release-4.9/e2e-aws-serial 421958d link /test pj-rehearse
ci/rehearse/openshift/router/release-4.9/e2e-upgrade 421958d link /test pj-rehearse
ci/rehearse/openshift/installer/release-4.9/e2e-azure-resourcegroup 421958d link /test pj-rehearse
ci/rehearse/openshift/installer/release-4.9/e2e-gcp-shared-vpc 421958d link /test pj-rehearse
ci/rehearse/openshift/kubernetes/release-4.9/k8s-e2e-gcp 421958d link /test pj-rehearse
ci/rehearse/openshift/cluster-cloud-controller-manager-operator/release-4.9/e2e-aws-ccm 421958d link /test pj-rehearse
ci/rehearse/openshift/origin/release-4.2/e2e-cmd 421958d link /test pj-rehearse

Full PR test history. Your PR dashboard.

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.

@openshift-merge-robot openshift-merge-robot merged commit 0fa0ce0 into openshift:master May 7, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 7, 2021

@stbenjam: Updated the step-registry configmap in namespace ci at cluster app.ci using the following files:

  • key baremetalds-devscripts-gather-commands.sh using file ci-operator/step-registry/baremetalds/devscripts/gather/baremetalds-devscripts-gather-commands.sh
  • key gather-audit-logs-commands.sh using file ci-operator/step-registry/gather/audit-logs/gather-audit-logs-commands.sh
  • key gather-must-gather-commands.sh using file ci-operator/step-registry/gather/must-gather/gather-must-gather-commands.sh
Details

In response to this:

Prior to 4.8, must-gather tries to access the internet on disconnected
environments. This change adds support for the steps that run
must-gather to support reading a must-gather-image.sh file from the
shared directory to override which image to use.

Baremetal disconnected will populate this file with the locally hosted
image when working on a release older than 4.8.

4.7 jobs are failing on the gather steps: https://prow.ci.openshift.org/view/gs/origin-ci-test/logs/periodic-ci-openshift-release-master-nightly-4.7-e2e-metal-ipi-ovn-ipv6/1390628216200237056

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.

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