Skip to content

test: Use dedicated multi-arch workloads in e2e tests #9921

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
crenshaw-dev merged 2 commits into from
Jul 11, 2022
Merged

test: Use dedicated multi-arch workloads in e2e tests #9921

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
d084bc9
test: Use dedicated multi-arch workloads in e2e tests
jannfis Jul 8, 2022
bd37ee0
Use correct tag
jannfis Jul 8, 2022
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
9 changes: 5 additions & 4 deletions test/e2e/app_management_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ func TestLocalManifestSync(t *testing.T) {
And(func(app *Application) {
res, _ := RunCli("app", "manifests", app.Name)
assert.Contains(t, res, "containerPort: 80")
assert.Contains(t, res, "image: gcr.io/heptio-images/ks-guestbook-demo:0.2")
assert.Contains(t, res, "image: quay.io/argoprojlabs/argocd-e2e-container:0.2")
}).
Given().
LocalPath(guestbookPathLocal).
Expand All @@ -959,7 +959,7 @@ func TestLocalManifestSync(t *testing.T) {
And(func(app *Application) {
res, _ := RunCli("app", "manifests", app.Name)
assert.Contains(t, res, "containerPort: 81")
assert.Contains(t, res, "image: gcr.io/heptio-images/ks-guestbook-demo:0.3")
assert.Contains(t, res, "image: quay.io/argoprojlabs/argocd-e2e-container:0.3")
}).
Given().
LocalPath("").
Expand All @@ -970,7 +970,7 @@ func TestLocalManifestSync(t *testing.T) {
And(func(app *Application) {
res, _ := RunCli("app", "manifests", app.Name)
assert.Contains(t, res, "containerPort: 80")
assert.Contains(t, res, "image: gcr.io/heptio-images/ks-guestbook-demo:0.2")
assert.Contains(t, res, "image: quay.io/argoprojlabs/argocd-e2e-container:0.2")
})
}

Expand Down Expand Up @@ -1191,7 +1191,8 @@ func TestPermissionWithScopedRepo(t *testing.T) {
Name(projName).
Destination("*,*").
When().
Create()
Create().
AddSource("*")

repoFixture.Given(t, true).
When().
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/diff_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ metadata:
spec:
containers:
- name: main
image: alpine:3.10.2
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
command:
- "true"
Expand All @@ -43,7 +43,7 @@ metadata:
spec:
containers:
- name: main
image: alpine:3.10.2
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
command:
- "true"
Expand Down
6 changes: 6 additions & 0 deletions test/e2e/fixture/project/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ type Context struct {
timeout int
name string
destination string
repos []string
}

func Given(t *testing.T) *Context {
Expand Down Expand Up @@ -43,6 +44,11 @@ func (c *Context) Destination(destination string) *Context {
return c
}

func (c *Context) SourceRepositories(repos []string) *Context {
c.repos = repos
return c
}

func (c *Context) And(block func()) *Context {
block()
return c
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/hook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ spec:
containers:
- command:
- "true"
image: "alpine:latest"
image: "quay.io/argoprojlabs/argocd-e2e-container:0.1"
imagePullPolicy: IfNotPresent
name: main
restartPolicy: Never
Expand Down Expand Up @@ -202,7 +202,7 @@ spec:
containers:
- command:
- "true"
image: "alpine:latest"
image: "quay.io/argoprojlabs/argocd-e2e-container:0.1"
imagePullPolicy: IfNotPresent
name: main
restartPolicy: Never
Expand All @@ -218,7 +218,7 @@ spec:
containers:
- command:
- "false"
image: "alpine:latest"
image: "quay.io/argoprojlabs/argocd-e2e-container:0.1"
imagePullPolicy: IfNotPresent
name: main
restartPolicy: Never
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/multiarch-container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FROM docker.io/library/busybox
CMD exec sh -c "trap : TERM INT; echo 'Hi' && tail -f /dev/null"
11 changes: 11 additions & 0 deletions test/e2e/multiarch-container/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh
set -x
VERSIONS="0.1 0.2 0.3"
Comment thread
crenshaw-dev marked this conversation as resolved.
PLATFORMS="linux/amd64,linux/arm64,linux/s390x,linux/ppc64le"
for version in $VERSIONS; do
docker buildx build \
-t "quay.io/argoprojlabs/argocd-e2e-container:${version}" \
--platform "${PLATFORMS}" \
--push \
.
done
2 changes: 1 addition & 1 deletion test/e2e/testdata/cluster-role/pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: main
image: alpine:3.10.2
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
command:
- "true"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/testdata/crd-validation/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: nginx
image: nginx:1.17.4-alpine
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
ports:
- containerPort: "80"
imagePullPolicy: IfNotPresent
2 changes: 1 addition & 1 deletion test/e2e/testdata/deployment/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ spec:
spec:
containers:
- name: nginx
image: nginx:1.17.4-alpine
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
ports:
- containerPort: 80
2 changes: 1 addition & 1 deletion test/e2e/testdata/deprecated-extensions/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: extensions-deployment
image: "gcr.io/heptio-images/ks-guestbook-demo:0.2"
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
ports:
- name: http
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/testdata/git-submodule/submodule-pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: main
image: alpine:3.10.2
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
command:
- "true"
Expand Down
7 changes: 1 addition & 6 deletions test/e2e/testdata/guestbook-logs/guestbook-ui-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,8 @@ spec:
app: guestbook-ui
spec:
containers:
- image: busybox
- image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
name: guestbook-ui
command:
- sh
args:
- -c
- "echo \"Hi\" && tail -f /dev/null"
ports:
- containerPort: 80
2 changes: 1 addition & 1 deletion test/e2e/testdata/guestbook-with-namespace/guestbook-ui-deployment-ns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
app: guestbook-ui
spec:
containers:
- image: gcr.io/heptio-images/ks-guestbook-demo:0.2
- image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
name: guestbook-ui
ports:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/testdata/guestbook-with-namespace/guestbook-ui-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
app: guestbook-ui
spec:
containers:
- image: gcr.io/heptio-images/ks-guestbook-demo:0.2
- image: quay.io/argoprojlabs/argocd-e2e-container:0.2
imagePullPolicy: IfNotPresent
name: guestbook-ui
ports:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/testdata/guestbook/guestbook-ui-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
app: guestbook-ui
spec:
containers:
- image: gcr.io/heptio-images/ks-guestbook-demo:0.2
- image: quay.io/argoprojlabs/argocd-e2e-container:0.2
imagePullPolicy: IfNotPresent
name: guestbook-ui
ports:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/testdata/guestbook_local/guestbook-ui-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
app: guestbook-ui
spec:
containers:
- image: gcr.io/heptio-images/ks-guestbook-demo:0.3
- image: quay.io/argoprojlabs/argocd-e2e-container:0.3
name: guestbook-ui
ports:
- containerPort: 81
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/testdata/hook-and-deployment/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: main
image: nginx:1.17.4-alpine
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
readinessProbe:
failureThreshold: 3
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/testdata/hook-and-deployment/hook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
containers:
- command:
- "true"
image: "alpine:3.10.2"
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
name: main
restartPolicy: Never
2 changes: 1 addition & 1 deletion test/e2e/testdata/hook/hook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
containers:
- command:
- "true"
image: "alpine:latest"
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
name: main
restartPolicy: Never
2 changes: 1 addition & 1 deletion test/e2e/testdata/hook/pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: main
image: alpine:latest
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
command:
- "true"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/testdata/kustomize/pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: main
image: alpine:3.10.2
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
command:
- "true"
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/testdata/multi-namespace-hook/multi-namespace-hook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
spec:
containers:
- name: nginx
image: nginx:1.17.4-alpine
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
ports:
- containerPort: 80
Expand All @@ -39,7 +39,7 @@ spec:
restartPolicy: Never
containers:
- name: main
image: alpine:3.10.2
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
command: [sh, -c, "sleep 10"]

Expand All @@ -56,6 +56,6 @@ spec:
restartPolicy: Never
containers:
- name: main
image: alpine:3.10.2
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
command: [sh, -c, "sleep 10"]
4 changes: 2 additions & 2 deletions test/e2e/testdata/multi-namespace/deployment-with-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
spec:
containers:
- name: helm-guestbook
image: "gcr.io/heptio-images/ks-guestbook-demo:0.2"
image: quay.io/argoprojlabs/argocd-e2e-container:0.2
imagePullPolicy: IfNotPresent
ports:
- name: http
Expand All @@ -30,4 +30,4 @@ spec:
readinessProbe:
httpGet:
path: /
port: http
port: http
2 changes: 1 addition & 1 deletion test/e2e/testdata/multi-namespace/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: helm-guestbook
image: "gcr.io/heptio-images/ks-guestbook-demo:0.2"
image: quay.io/argoprojlabs/argocd-e2e-container:0.2
imagePullPolicy: IfNotPresent
ports:
- name: http
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/testdata/networking/guestbook-ui-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
app: guestbook-ui
spec:
containers:
- image: gcr.io/heptio-images/ks-guestbook-demo:0.2
- image: quay.io/argoprojlabs/argocd-e2e-container:0.2
name: guestbook-ui
ports:
- containerPort: 80
2 changes: 1 addition & 1 deletion test/e2e/testdata/one-deployment/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ spec:
containers:
- name: main
command: ["sleep", "999"]
image: alpine:3.10.2
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent

2 changes: 1 addition & 1 deletion test/e2e/testdata/two-nice-pods/pod-1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: main
image: alpine:3.10.2
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
command:
- "true"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/testdata/two-nice-pods/pod-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: main
image: alpine:3.10.2
image: quay.io/argoprojlabs/argocd-e2e-container:0.1
imagePullPolicy: IfNotPresent
command:
- "true"
Expand Down