Skip to content

Bug 1847363: Fix tests on s390x: replace centos by ubi #25558

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

Closed
r4f4 wants to merge 4 commits into from
Closed

Bug 1847363: Fix tests on s390x: replace centos by ubi #25558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
daed55b
Fix rsh test to use ubi instead of centos
r4f4 Sep 26, 2020
e5f3cfd
test/custom-build: replace centos by ubi
r4f4 Sep 27, 2020
986ae96
test/multistage: replace centos by ubi
r4f4 Sep 27, 2020
e875b36
test/optimized: replace centos by ubi
r4f4 Sep 27, 2020
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 test/extended/builds/multistage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ COPY --from=busybox:latest /bin/ping /test/
Source: buildv1.BuildSource{
Dockerfile: &testDockerfile,
Images: []buildv1.ImageSource{
{From: corev1.ObjectReference{Kind: "DockerImage", Name: "centos:7"}, As: []string{"scratch"}},
{From: corev1.ObjectReference{Kind: "DockerImage", Name: "registry.access.redhat.com/ubi8/ubi"}, As: []string{"scratch"}},
},
},
Strategy: buildv1.BuildStrategy{
Expand Down Expand Up @@ -82,7 +82,7 @@ COPY --from=busybox:latest /bin/ping /test/
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(s).ToNot(o.ContainSubstring("--> FROM scratch"))
o.Expect(s).ToNot(o.ContainSubstring("FROM busybox"))
o.Expect(s).To(o.ContainSubstring("STEP 1: FROM centos:7 AS test"))
o.Expect(s).To(o.ContainSubstring("STEP 1: FROM registry.access.redhat.com/ubi8/ubi AS test"))
o.Expect(s).To(o.ContainSubstring("COPY --from"))
o.Expect(s).To(o.ContainSubstring(fmt.Sprintf("\"OPENSHIFT_BUILD_NAMESPACE\"=\"%s\"", oc.Namespace())))
e2e.Logf("Build logs:\n%s", result)
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/optimized.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] Optimized image builds", func()
oc = exutil.NewCLI("build-dockerfile-env")
skipLayers = buildv1.ImageOptimizationSkipLayers
testDockerfile = `
FROM centos:7
FROM registry.access.redhat.com/ubi8/ubi
RUN yum list installed
USER 1001
`
Expand Down
6 changes: 3 additions & 3 deletions test/extended/cli/rsh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var _ = g.Describe("[sig-cli] oc rsh", func() {
var (
oc = exutil.NewCLI("oc-rsh")
multiContainersFixture = exutil.FixturePath("testdata", "cli", "pod-with-two-containers.yaml")
podsLabel = exutil.ParseLabelsOrDie("name=hello-centos")
podsLabel = exutil.ParseLabelsOrDie("name=hello-ubi")
)

g.Describe("rsh specific flags", func() {
Expand All @@ -32,10 +32,10 @@ var _ = g.Describe("[sig-cli] oc rsh", func() {
g.By("running the rsh command without specify container name")
out, err := oc.Run("rsh").Args(pods[0], "mkdir", "/tmp/test1").Output()
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(out).To(o.ContainSubstring("Defaulting container name to hello-centos"))
o.Expect(out).To(o.ContainSubstring("Defaulting container name to hello-ubi"))

g.By("running the rsh command with specify container name and shell")
_, err = oc.Run("rsh").Args("--container=hello-centos-2", "--shell=/bin/sh", pods[0], "mkdir", "/tmp/test3").Output()
_, err = oc.Run("rsh").Args("--container=hello-ubi-2", "--shell=/bin/sh", pods[0], "mkdir", "/tmp/test3").Output()
o.Expect(err).NotTo(o.HaveOccurred())
})
})
Expand Down
12 changes: 6 additions & 6 deletions test/extended/testdata/bindata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20361,7 +20361,7 @@ func testExtendedTestdataBuildsCustomBuildDockerfile() (*asset, error) {
return a, nil
}

var _testExtendedTestdataBuildsCustomBuildDockerfileSample = []byte(`FROM docker.io/centos:7
var _testExtendedTestdataBuildsCustomBuildDockerfileSample = []byte(`FROM registry.access.redhat.com/ubi8/ubi-minimal
RUN touch /tmp/built
`)

Expand Down Expand Up @@ -24934,11 +24934,11 @@ apiVersion: v1
metadata:
name: doublecontainers
labels:
name: hello-centos
name: hello-ubi
spec:
containers:
- name: hello-centos
image: docker.io/centos:centos7
- name: hello-ubi
image: registry.access.redhat.com/ubi8/ubi-minimal
command:
- /bin/sleep
- infinity
Expand All @@ -24949,8 +24949,8 @@ spec:
imagePullPolicy: IfNotPresent
capabilities: {}
securityContext: {}
- name: hello-centos-2
image: docker.io/centos:centos7
- name: hello-ubi-2
image: registry.access.redhat.com/ubi8/ubi-minimal
command:
- /bin/sleep
- infinity
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/custom-build/Dockerfile.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM docker.io/centos:7
FROM registry.access.redhat.com/ubi8/ubi-minimal
RUN touch /tmp/built
10 changes: 5 additions & 5 deletions test/extended/testdata/cli/pod-with-two-containers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ apiVersion: v1
metadata:
name: doublecontainers
labels:
name: hello-centos
name: hello-ubi
spec:
containers:
- name: hello-centos
image: docker.io/centos:centos7
- name: hello-ubi
image: registry.access.redhat.com/ubi8/ubi-minimal
command:
- /bin/sleep
- infinity
Expand All @@ -18,8 +18,8 @@ spec:
imagePullPolicy: IfNotPresent
capabilities: {}
securityContext: {}
- name: hello-centos-2
image: docker.io/centos:centos7
- name: hello-ubi-2
image: registry.access.redhat.com/ubi8/ubi-minimal
command:
- /bin/sleep
- infinity
Expand Down