Skip to content

test: External image test was silently failing #25958

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.

Sign up for GitHub

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

Merged
smarterclayton merged 2 commits into from
Mar 17, 2021
Merged

test: External image test was silently failing #25958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a188ea8
test: Correctly detect non-mirrored images
smarterclayton Mar 16, 2021
f02938d
test: Fix regressions in missing images
smarterclayton Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/openshift-tests/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,11 @@ func pulledInvalidImages(fromRepository string) ginkgo.JUnitForEventsFunc {
pulls := make(map[string]sets.String)
for _, event := range events {
// only messages that include a Pulled reason
if !strings.Contains(event.Message, " reason/Pulled ") {
if !strings.Contains(" "+event.Message, " reason/Pulled ") {
continue
}
// only look at pull events from an e2e-* namespace
if !strings.Contains(event.Locator, " ns/e2e-") {
if !strings.Contains(" "+event.Locator, " ns/e2e-") {
continue
}

Expand Down
28 changes: 14 additions & 14 deletions test/extended/testdata/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/extended/testdata/cmd/test/cmd/testdata/hello-openshift/hello-pod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"containers": [
{
"name": "hello-openshift",
"image": "k8s.gcr.io/e2e-test-images/agnhost:2.20",
"image": "k8s.gcr.io/e2e-test-images/agnhost:2.21",
"args": ["netexec"],
"ports": [
{
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/cmd/test/cmd/testdata/mixed-api-versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ items:
run: v1-job
spec:
containers:
- image: k8s.gcr.io/e2e-test-images/agnhost:2.20
- image: k8s.gcr.io/e2e-test-images/agnhost:2.21
name: hello-container
restartPolicy: Never

Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/cmd/test/cmd/testdata/templateinstance_objectkinds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ items:
spec:
containers:
- name: hello-openshift
image: k8s.gcr.io/e2e-test-images/agnhost:2.20
image: k8s.gcr.io/e2e-test-images/agnhost:2.21
- kind: Route
apiVersion: v1
metadata:
Expand Down
4 changes: 2 additions & 2 deletions test/extended/testdata/router/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ items:
terminationGracePeriodSeconds: 1
containers:
- name: test
image: k8s.gcr.io/e2e-test-images/agnhost:2.20
image: k8s.gcr.io/e2e-test-images/agnhost:2.21
args: ["netexec"]
ports:
- containerPort: 8080
Expand All @@ -97,7 +97,7 @@ items:
terminationGracePeriodSeconds: 1
containers:
- name: test
image: k8s.gcr.io/e2e-test-images/agnhost:2.20
image: k8s.gcr.io/e2e-test-images/agnhost:2.21
args: ["netexec"]
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/router/router-common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ objects:
terminationGracePeriodSeconds: 1
containers:
- name: test
image: k8s.gcr.io/e2e-test-images/agnhost:2.20
image: k8s.gcr.io/e2e-test-images/agnhost:2.21
args: ["netexec"]
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/router/router-config-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ objects:
terminationGracePeriodSeconds: 1
containers:
- name: test
image: k8s.gcr.io/e2e-test-images/agnhost:2.20
image: k8s.gcr.io/e2e-test-images/agnhost:2.21
args: ["netexec"]
ports:
- containerPort: 8080
Expand Down
4 changes: 2 additions & 2 deletions test/extended/testdata/router/router-metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ items:
terminationGracePeriodSeconds: 1
containers:
- name: test
image: k8s.gcr.io/e2e-test-images/agnhost:2.20
image: k8s.gcr.io/e2e-test-images/agnhost:2.21
args: ["netexec"]
ports:
- containerPort: 8080
Expand All @@ -98,7 +98,7 @@ items:
terminationGracePeriodSeconds: 1
containers:
- name: test
image: k8s.gcr.io/e2e-test-images/agnhost:2.20
image: k8s.gcr.io/e2e-test-images/agnhost:2.21
args: ["netexec"]
ports:
- containerPort: 8080
Expand Down
6 changes: 3 additions & 3 deletions test/extended/testdata/router/weighted-router.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ objects:
terminationGracePeriodSeconds: 1
containers:
- name: test
image: k8s.gcr.io/e2e-test-images/agnhost:2.20
image: k8s.gcr.io/e2e-test-images/agnhost:2.21
args: ["netexec"]
ports:
- containerPort: 8080
Expand All @@ -140,7 +140,7 @@ objects:
terminationGracePeriodSeconds: 1
containers:
- name: test
image: k8s.gcr.io/e2e-test-images/agnhost:2.20
image: k8s.gcr.io/e2e-test-images/agnhost:2.21
args: ["netexec"]
ports:
- containerPort: 8080
Expand All @@ -158,7 +158,7 @@ objects:
terminationGracePeriodSeconds: 1
containers:
- name: test
image: k8s.gcr.io/e2e-test-images/agnhost:2.20
image: k8s.gcr.io/e2e-test-images/agnhost:2.21
args: ["netexec"]
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/templates/templateinstance_badobject.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ items:
spec:
containers:
- name: hello-openshift
image: k8s.gcr.io/e2e-test-images/agnhost:2.20
image: k8s.gcr.io/e2e-test-images/agnhost:2.21
2 changes: 1 addition & 1 deletion test/extended/testdata/templates/templateinstance_objectkinds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ items:
spec:
containers:
- name: hello-openshift
image: k8s.gcr.io/e2e-test-images/agnhost:2.20
image: k8s.gcr.io/e2e-test-images/agnhost:2.21
- kind: Route
apiVersion: v1
metadata:
Expand Down