Skip to content

BUILD-250 pull in multi-arch friendly version of roots2i and simples2i, add simples2i to mirroring test infra #26149

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
openshift-merge-robot merged 2 commits into from
May 28, 2021
Merged

BUILD-250 pull in multi-arch friendly version of roots2i and simples2i, add simples2i to mirroring test infra #26149

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
6361aa8
BUILD-250 updating roots2i image for its multiarch analogue
May 11, 2021
37481b6
BUILD-250 updating simples2i image for its multiarch analogue
May 11, 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
6 changes: 3 additions & 3 deletions test/extended/builds/s2i_root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package builds
import (
"context"
"fmt"
"github.com/openshift/origin/test/extended/util/image"

g "github.com/onsi/ginkgo"
o "github.com/onsi/gomega"
Expand All @@ -14,6 +13,7 @@ import (

buildv1 "github.com/openshift/api/build/v1"
exutil "github.com/openshift/origin/test/extended/util"
"github.com/openshift/origin/test/extended/util/image"
)

func Before(oc *exutil.CLI) {
Expand All @@ -37,7 +37,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] s2i build with a root user imag
Before(oc)
defer After(oc)

firstArgString := fmt.Sprintf("%s~https://github.com/sclorg/nodejs-ex", image.LocationFor("registry.ci.openshift.org/ocp/4.7:test-build-roots2i"))
firstArgString := fmt.Sprintf("%s~https://github.com/sclorg/nodejs-ex", image.LocationFor("registry.ci.openshift.org/ocp/4.8:test-build-roots2i"))
Copy link
Contributor

@gabemontero gabemontero May 14, 2021

Choose a reason for hiding this comment

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

So distilling https://github.com/openshift/origin/pull/26149/files#r632694287 for this line.

  1. temporary step, change this to firstArgString := fmt.Sprintf("%s~https://github.com/sclorg/nodejs-ex", "registry.ci.openshift.org/ocp/4.8:test-build-roots2i")

  2. if tests from this file are OK, we reach out to @soltysh or @smarterclayton and have them mirroregistry.ci.openshift.org/ocp/4.8:test-build-roots2i to quay.io/openshift/community-e2e-images

  3. then we revert this line back to the way you have it now

err := oc.Run("new-app").Args(firstArgString, "--name", "nodejsfail").Execute()
o.Expect(err).NotTo(o.HaveOccurred())

Expand Down Expand Up @@ -114,7 +114,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] s2i build with a root user imag
roleBinding, err = oc.AdminKubeClient().RbacV1().RoleBindings(oc.Namespace()).Create(context.Background(), roleBinding, metav1.CreateOptions{})
o.Expect(err).NotTo(o.HaveOccurred())

firstArgString := fmt.Sprintf("%s~https://github.com/sclorg/nodejs-ex", image.LocationFor("registry.ci.openshift.org/ocp/4.7:test-build-roots2i"))
firstArgString := fmt.Sprintf("%s~https://github.com/sclorg/nodejs-ex", image.LocationFor("registry.ci.openshift.org/ocp/4.8:test-build-roots2i"))
Copy link
Contributor

@gabemontero gabemontero May 14, 2021

Choose a reason for hiding this comment

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

So distilling https://github.com/openshift/origin/pull/26149/files#r632694287 for this line.

  1. temporary step, change this to firstArgString := fmt.Sprintf("%s~https://github.com/sclorg/nodejs-ex", "registry.ci.openshift.org/ocp/4.8:test-build-roots2i")

  2. if tests from this file are OK, we reach out to @soltysh or @smarterclayton and have them mirroregistry.ci.openshift.org/ocp/4.8:test-build-roots2i to quay.io/openshift/community-e2e-images

  3. then we revert this line back to the way you have it now

err = oc.Run("new-build").Args(firstArgString, "--name", "nodejspass").Execute()
o.Expect(err).NotTo(o.HaveOccurred())

Expand Down
38 changes: 19 additions & 19 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/builds/build-postcommit/sti.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ items:
sourceStrategy:
from:
kind: DockerImage
name: quay.io/redhat-developer/test-build-simples2i:latest
name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
resources: {}
postCommit: {}
nodeSelector: null
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/build-timing/test-s2i-build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"sourceStrategy": {
"from": {
"kind": "DockerImage",
"name": "quay.io/redhat-developer/test-build-simples2i:latest"
"name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
},
"env": [
{
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/statusfail-failedassemble.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ spec:
sourceStrategy:
from:
kind: DockerImage
name: quay.io/redhat-developer/test-build-simples2i:latest
name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/statusfail-postcommithook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ spec:
sourceStrategy:
from:
kind: DockerImage
name: quay.io/redhat-developer/test-build-simples2i:latest
name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
type: Source
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/statusfail-pushtoregistry.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ spec:
sourceStrategy:
from:
kind: DockerImage
name: quay.io/redhat-developer/test-build-simples2i:latest
name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
type: Source
4 changes: 2 additions & 2 deletions test/extended/testdata/builds/test-build-cluster-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ items:
sourceStrategy:
from:
kind: DockerImage
name: quay.io/redhat-developer/test-build-simples2i:latest
name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
type: Source
- apiVersion: build.openshift.io/v1
kind: BuildConfig
Expand All @@ -33,5 +33,5 @@ items:
value: "5"
from:
kind: DockerImage
name: quay.io/redhat-developer/test-build-simples2i:latest
name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
type: Source
4 changes: 2 additions & 2 deletions test/extended/testdata/builds/test-build-proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ items:
value: 127.0.0.1:3128
from:
kind: DockerImage
name: quay.io/redhat-developer/test-build-simples2i:latest
name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
- kind: BuildConfig
apiVersion: v1
metadata:
Expand All @@ -57,7 +57,7 @@ items:
sourceStrategy:
from:
kind: DockerImage
name: quay.io/redhat-developer/test-build-simples2i:latest
name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
env:
- name: SOME_HTTP_PROXY
value: https://envuser:[email protected]
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/test-build-revision.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"sourceStrategy": {
"from": {
"kind": "DockerImage",
"name": "quay.io/redhat-developer/test-build-simples2i:latest"
"name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/test-nosrc-build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"sourceStrategy": {
"from": {
"kind": "DockerImage",
"name": "quay.io/redhat-developer/test-build-simples2i:latest"
"name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions test/extended/testdata/builds/test-s2i-build-quota.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"spec": {
"resources": {
"limits": {
"cpu": "60m",
"cpu": "400m",
"memory": "400Mi"
}
},
Expand All @@ -24,8 +24,8 @@
"type": "Source",
"sourceStrategy": {
"from": {
"kind":"DockerImage",
"name":"quay.io/redhat-developer/test-build-simples2i:latest"
"kind": "DockerImage",
"name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
},
"env": [
{
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/test-s2i-build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
],
"from": {
"kind": "DockerImage",
"name": "quay.io/redhat-developer/test-build-simples2i:latest"
"name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/test-s2i-no-outputname.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
],
"from": {
"kind": "DockerImage",
"name": "quay.io/redhat-developer/test-build-simples2i:latest"
"name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/valuefrom/failed-sti-build-value-from-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
sourceStrategy:
from:
kind: DockerImage
name: quay.io/redhat-developer/test-build-simples2i:latest
name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
env:
- name: BUILD_LOGLEVEL
value: "5"
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/valuefrom/successful-sti-build-value-from-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
sourceStrategy:
from:
kind: DockerImage
name: quay.io/redhat-developer/test-build-simples2i:latest
name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
env:
- name: BUILD_LOGLEVEL
value: "5"
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/templates/templateinstance_readiness.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ objects:
sourceStrategy:
from:
kind: DockerImage
name: quay.io/redhat-developer/test-build-simples2i:latest
name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
output:
to:
kind: ImageStreamTag
Expand Down
5 changes: 4 additions & 1 deletion test/extended/util/image/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ func init() {

// used by build s2i e2e's to verify that builder with USER root are not allowed
// the github.com/openshift/build-test-images repo is built out of github.com/openshift/release
"registry.ci.openshift.org/ocp/4.7:test-build-roots2i": -1,
"registry.ci.openshift.org/ocp/4.8:test-build-roots2i": -1,
Copy link
Contributor

@gabemontero gabemontero May 14, 2021

Choose a reason for hiding this comment

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

We'll minimally need to add

"registry.ci.openshift.org/ocp/4.8:test-build-simples2i": -1,

as well


// used by all the rest build s2s e2e tests
"registry.ci.openshift.org/ocp/4.8:test-build-simples2i": -1,
Copy link
Contributor

@gabemontero gabemontero May 18, 2021

Choose a reason for hiding this comment

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

OK let's temporarily remove this @alicerum so we can prove that the USER 1001 fix to registry.ci.openshift.org/ocp/4.8:test-build-simples2i worked.

registry.ci.openshift.org/ocp/4.8:test-build-simples2i has been updated with your recently merged build-test-images PR


// moved to GCR
"k8s.gcr.io/sig-storage/csi-attacher:v2.2.0": -1,
Expand Down
3 changes: 2 additions & 1 deletion test/extended/util/image/zz_generated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,5 @@ k8s.gcr.io/sig-storage/nfs-provisioner:v2.2.2 quay.io/openshift/community-e2e-im
k8s.gcr.io/sig-storage/snapshot-controller:v2.1.1 quay.io/openshift/community-e2e-images:e2e-k8s-gcr-io-sig-storage-snapshot-controller-v2-1-1-n5BM_jX2npV3RxHM
k8s.gcr.io/sig-storage/snapshot-controller:v3.0.2 quay.io/openshift/community-e2e-images:e2e-k8s-gcr-io-sig-storage-snapshot-controller-v3-0-2-IVmgAhsROusslTdY
quay.io/redhat-developer/nfs-server:1.0 quay.io/openshift/community-e2e-images:e2e-quay-io-redhat-developer-nfs-server-1-0-Wz4GFQ2IuhYmh2mB
registry.ci.openshift.org/ocp/4.7:test-build-roots2i quay.io/openshift/community-e2e-images:e2e-registry-ci-openshift-org-ocp-4-7-test-build-roots2i-tG08qb6aSmDhxBBy
registry.ci.openshift.org/ocp/4.8:test-build-roots2i quay.io/openshift/community-e2e-images:e2e-registry-ci-openshift-org-ocp-4-8-test-build-roots2i-FmW7zebvtGKkls4B
Copy link
Contributor

@gabemontero gabemontero May 14, 2021

Choose a reason for hiding this comment

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

I believe quay.io/openshift/community-e2e-images:e2e-registry-ci-openshift-org-ocp-4-8-test-build-roots2i-FmW7zebvtGKkls4B will get set up when we reach out to Maciej / Clayton to do the mirroring.

registry.ci.openshift.org/ocp/4.8:test-build-simples2i quay.io/openshift/community-e2e-images:e2e-registry-ci-openshift-org-ocp-4-8-test-build-simples2i-7A9bkBd9X4G-ELh0