Skip to content

Commit c60cd38

Browse files
Merge pull request #30060 from bertinatto/fix-readme-image
NO-JIRA: Update image mirroring instructions to avoid using external binary
2 parents 98992d3 + 11594ac commit c60cd38

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

test/extended/util/image/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ for easy mirroring by the `openshift-tests images` command.
2525

2626
When adding a new image, first make the code changes and compile the `openshift-tests` binary. Then run `hack/update-generated-bindata.sh` to update `test/extended/util/image/zz_generated.txt`. Contact one of the OWNERS of this directory and have them review the image for inclusion into our suite (usually granted in the process above). Before merge and after review they will run the following command to mirror the content to quay:
2727

28-
openshift-tests images --upstream --to-repository quay.io/openshift/community-e2e-images | oc image mirror -f - --filter-by-os=.*
28+
OPENSHIFT_SKIP_EXTERNAL_TESTS=1 ./openshift-tests images --upstream --to-repository quay.io/openshift/community-e2e-images | oc image mirror -f - --filter-by-os=.*
2929

3030
Note: The `registry.k8s.io/pause:3.9` image (and possibly others) contains uncompressed layers which quay.io does not allow. The `oc image mirror` command always
3131
mirrors the layers as is and thus fails to mirror that image. You can use skopeo instead which will successfully mirror the image, but changes the
@@ -55,7 +55,7 @@ When a new version of Kubernetes is introduced new images will likely need to be
5555
2. Observe whether any tests fail due to missing images
5656
3. Notify an OWNER in this file, who will run:
5757

58-
openshift-tests images --upstream --to-repository quay.io/openshift/community-e2e-images | oc image mirror -f - --filter-by-os=.*
58+
OPENSHIFT_SKIP_EXTERNAL_TESTS=1 ./openshift-tests images --upstream --to-repository quay.io/openshift/community-e2e-images | oc image mirror -f - --filter-by-os=.*
5959

6060
Note: see above information about using skopeo to mirror images that contain uncompressed layers, such as the `pause` image.
6161

@@ -94,10 +94,10 @@ When mirroring from a PR (granting access), you should check out the PR in quest
9494

9595
Then run
9696

97-
openshift-tests images --upstream --to-repository quay.io/openshift/community-e2e-images
97+
OPENSHIFT_SKIP_EXTERNAL_TESTS=1 ./openshift-tests images --upstream --to-repository quay.io/openshift/community-e2e-images
9898

9999
to verify that all things check out. If everything looks good, run
100100

101-
openshift-tests images --upstream --to-repository quay.io/openshift/community-e2e-images | oc image mirror -f - --filter-by-os=.*
101+
OPENSHIFT_SKIP_EXTERNAL_TESTS=1 ./openshift-tests images --upstream --to-repository quay.io/openshift/community-e2e-images | oc image mirror -f - --filter-by-os=.*
102102

103-
You must be logged in (to docker, using `oc registry login --registry=quay.io` or `skopeo login` or `docker login`) to a quay account that has write permission to `quay.io/openshift/community-e2e-images` which every OWNER should have.
103+
You must be logged in (to docker, using `oc registry login --registry=quay.io` or `skopeo login` or `docker login`) to a quay account that has write permission to `quay.io/openshift/community-e2e-images` which every OWNER should have.

0 commit comments

Comments
 (0)