Skip to content
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

[WiP] naren/support arm e2e tests #956

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

[WiP] naren/support arm e2e tests #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e16eae4
Add support for multiarch build
narphu Aug 30, 2024
8506265
Update wildcard to find latest RPMs
narphu Aug 30, 2024
b081227
Update the rpm name to match with the one in Makefile
narphu Aug 30, 2024
c8ddb0a
Add RPM mismatch checks
narphu Sep 3, 2024
1e51a78
Upgrade images used for e2e tests to leverage ARM support
narphu Sep 3, 2024
f25efba
Update make and workflows for ARM
narphu Sep 3, 2024
2743d58
Fix Makefile bug
narphu Oct 15, 2024
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
95 changes: 76 additions & 19 deletions .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,10 @@ jobs:
e2e-leg-1-admintools:
if: ${{ ! contains(github.ref, 'k8s-sync') && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'admintools leg 1' || inputs.e2e_test_suites == '') }}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -148,7 +151,10 @@ jobs:
e2e-leg-1-vcluster:
if: ${{ ! github.event.pull_request.head.repo.fork && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'vcluster leg 1' || inputs.e2e_test_suites == '')}}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -168,7 +174,10 @@ jobs:
e2e-leg-2-admintools:
if: ${{ ! contains(github.ref, 'k8s-sync') && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'admintools leg 2' || inputs.e2e_test_suites == '') }}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -210,7 +219,10 @@ jobs:
e2e-leg-2-vcluster:
if: ${{ ! github.event.pull_request.head.repo.fork && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'vcluster leg 2' || inputs.e2e_test_suites == '')}}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -230,7 +242,10 @@ jobs:
e2e-leg-3-admintools:
if: ${{ ! contains(github.ref, 'k8s-sync') && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'admintools leg 3' || inputs.e2e_test_suites == '') }}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -270,7 +285,10 @@ jobs:
e2e-leg-3-vcluster:
if: ${{ ! github.event.pull_request.head.repo.fork && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'vcluster leg 3' || inputs.e2e_test_suites == '')}}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -289,7 +307,10 @@ jobs:
e2e-leg-4-admintools:
if: ${{ ! contains(github.ref, 'k8s-sync') && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'admintools leg 4' || inputs.e2e_test_suites == '') }}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -312,7 +333,10 @@ jobs:
e2e-leg-4-vcluster:
if: ${{ ! github.event.pull_request.head.repo.fork && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'vcluster leg 4' || inputs.e2e_test_suites == '')}}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -334,7 +358,10 @@ jobs:
e2e-leg-5-admintools:
if: ${{ ! contains(github.ref, 'k8s-sync') && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'admintools leg 5' || inputs.e2e_test_suites == '') }}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -359,7 +386,10 @@ jobs:
e2e-leg-5-vcluster:
if: ${{ ! github.event.pull_request.head.repo.fork && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'vcluster leg 5' || inputs.e2e_test_suites == '')}}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -383,7 +413,10 @@ jobs:
e2e-leg-6-vcluster:
if: ${{ ! github.event.pull_request.head.repo.fork && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'vcluster leg 6' || inputs.e2e_test_suites == '')}}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -423,7 +456,10 @@ jobs:
e2e-leg-7-vcluster:
if: ${{ ! github.event.pull_request.head.repo.fork && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'vcluster leg 7' || inputs.e2e_test_suites == '')}}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -443,7 +479,10 @@ jobs:
e2e-leg-8-vcluster-offline:
if: ${{ ! github.event.pull_request.head.repo.fork && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'leg 8' || inputs.e2e_test_suites == '')}}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -487,7 +526,10 @@ jobs:
e2e-leg-9-vcluster:
if: ${{ ! github.event.pull_request.head.repo.fork && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'vcluster leg 9' || inputs.e2e_test_suites == '')}}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -533,7 +575,10 @@ jobs:
e2e-server-upgrade-admintools:
if: ${{ ! contains(github.ref, 'k8s-sync') && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'admintools server upgrade' || inputs.e2e_test_suites == '') }}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -554,7 +599,10 @@ jobs:
e2e-server-upgrade-vcluster:
if: ${{ ! github.event.pull_request.head.repo.fork && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'vcluster server upgrade' || inputs.e2e_test_suites == '')}}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -574,7 +622,10 @@ jobs:
e2e-operator-upgrade:
if: ${{ ! contains(github.ref, 'k8s-sync') && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'admintools operator upgrade' || inputs.e2e_test_suites == '') }}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -598,7 +649,10 @@ jobs:
e2e-udx-admintools:
if: ${{ ! contains(github.ref, 'k8s-sync') && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'admintools udx' || inputs.e2e_test_suites == '') }}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -621,7 +675,10 @@ jobs:
e2e-udx-vcluster:
if: ${{ ! github.event.pull_request.head.repo.fork && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'vcluster udx' || inputs.e2e_test_suites == '')}}
needs: [build]
runs-on: ubuntu-latest
strategy:
matrix:
runner: [ ubuntu-latest, ARM64 ]
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ E2E_ADDITIONAL_ARGS?=
# If you wish to build the image targeting other platforms you can use the --platform flag: https://docs.docker.com/build/building/multi-platform/
# (i.e. docker buildx build --platform=linux/amd64,linux/arm64). However, you must enable docker buildKit for it.
# More info: https://docs.docker.com/develop/develop-images/build_enhancements/
TARGET_ARCH?=linux/amd64
TARGET_ARCH?=linux/amd64,linux/arm64

#
# Deployment Variables
Expand Down
2 changes: 1 addition & 1 deletion config/samples/minio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ spec:
spec:
containers:
- name: aws
image: amazon/aws-cli:2.2.24
image: amazon/aws-cli:2.17.34
command:
[
"bash",
Expand Down
15 changes: 14 additions & 1 deletion docker-vertica-v2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ BASE_OS_VERSION?=9
FOR_GITHUB_CI?=false
VERTICA_IMG?=vertica-k8s
MINIMAL_VERTICA_IMG?=
TARGET_ARCH?=linux/amd64
TARGET_ARCH?=linux/amd64,linux/arm64
VERTICA_ADDITIONAL_DOCKER_BUILD_OPTIONS?=
VERTICA_VERSION?=

Expand All @@ -30,6 +30,19 @@ endif
endif
endif

VERTICA_X86_VERSION?=$(shell rpm --nosignature -qp --queryformat '%{VERSION}-%{RELEASE}' packages/$(VERTICA_X86_RPM))
VERTICA_ARM_VERSION?=$(shell rpm --nosignature -qp --queryformat '%{VERSION}-%{RELEASE}' packages/$(VERTICA_ARM64_RPM))

ifdef VERTICA_X86_VERSION
VERTICA_VERSION=$(VERTICA_X86_VERSION)
ifdef VERTICA_ARM_VERSION
ifneq ($(VERTICA_ARM_VERSION), $(VERTICA_X86_VERSION))
$(error RPM version mismatch $(VERTICA_X86_RPM) $(VERTICA_ARM64_RPM))
exit 1
endif
endif
endif

all: docker-build-vertica

.PHONY: docker-build-vertica
Expand Down
8 changes: 4 additions & 4 deletions scripts/setup-kustomize.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ EOF
value: "aws s3 rm --recursive --endpoint $ENDPOINT s3://${BUCKET_OR_CLUSTER}${PATH_PREFIX}${TESTCASE_NAME} --no-verify-ssl"
- op: replace
path: /spec/containers/0/image
value: amazon/aws-cli:2.2.24
value: amazon/aws-cli:2.17.34
- op: add
path: /spec/containers/0/env/-
value:
Expand Down Expand Up @@ -445,7 +445,7 @@ EOF
value: az storage remove --account-name $BUCKET_OR_CLUSTER --container-name $CONTAINER_NAME --name ${PATH_PREFIX:1}${TESTCASE_NAME} --recursive
- op: replace
path: /spec/containers/0/image
value: mcr.microsoft.com/azure-cli:2.29.0
value: mcr.microsoft.com/azure-cli:2.63.0
EOF
if [ -n "$ACCOUNT_KEY" ]
then
Expand Down Expand Up @@ -486,7 +486,7 @@ EOF
value: az storage blob delete-batch --account-name $BUCKET_OR_CLUSTER --source $CONTAINER_NAME --pattern "${PATH_PREFIX:1}${TESTCASE_NAME}/*"
- op: replace
path: /spec/containers/0/image
value: mcr.microsoft.com/azure-cli:2.29.0
value: mcr.microsoft.com/azure-cli:2.63.0
- op: add
path: /spec/containers/0/env/-
value:
Expand All @@ -501,7 +501,7 @@ EOF
value: "cd ${COMMUNAL_PATH_PREFIX} && rm -rf ${TESTCASE_NAME}"
- op: replace
path: /spec/containers/0/image
value: quay.io/helmpack/chart-testing:v3.3.1
value: quay.io/helmpack/chart-testing:v3.11.0
- op: add
path: /spec/containers/0/volumeMounts/-
value:
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-leg-1-at-only/auto-restart-vertica/12-create-hello-world-et.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ spec:
restartPolicy: Never
containers:
- name: test
image: bitnami/kubectl:1.20.4
image: bitnami/kubectl:1.30.4
command: ["echo", "Hello World!"]
2 changes: 1 addition & 1 deletion tests/e2e-leg-10/verify-vrep/09-create-data-users-tlsconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ spec:
restartPolicy: Never
containers:
- name: test
image: bitnami/kubectl:1.20.4
image: bitnami/kubectl:1.30.4
command: ["/bin/entrypoint.sh"]
volumeMounts:
- name: entrypoint-volume
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-leg-10/verify-vrep/20-verify-target-data.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
restartPolicy: Never
containers:
- name: test
image: bitnami/kubectl:1.20.4
image: bitnami/kubectl:1.30.4
command: ["/bin/entrypoint.sh"]
volumeMounts:
- name: entrypoint-volume
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-leg-10/verify-vrep/35-verify-target-sandbox-data.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
restartPolicy: Never
containers:
- name: test
image: bitnami/kubectl:1.20.4
image: bitnami/kubectl:1.30.4
command: ["/bin/entrypoint.sh"]
volumeMounts:
- name: entrypoint-volume
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-leg-10/verify-vrep/50-verify-target-sandbox-data-custom-username.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
restartPolicy: Never
containers:
- name: test
image: bitnami/kubectl:1.20.4
image: bitnami/kubectl:1.30.4
command: ["/bin/entrypoint.sh"]
volumeMounts:
- name: entrypoint-volume
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-leg-10/verify-vrep/65-verify-target-sandbox-data-tls-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
restartPolicy: Never
containers:
- name: test
image: bitnami/kubectl:1.20.4
image: bitnami/kubectl:1.30.4
command: ["/bin/entrypoint.sh"]
volumeMounts:
- name: entrypoint-volume
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-leg-10/verify-vrep/70-create-target-sandbox-data.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
restartPolicy: Never
containers:
- name: test
image: bitnami/kubectl:1.20.4
image: bitnami/kubectl:1.30.4
command: ["/bin/entrypoint.sh"]
volumeMounts:
- name: entrypoint-volume
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-leg-10/verify-vrep/85-verify-target-sandbox-data.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
restartPolicy: Never
containers:
- name: test
image: bitnami/kubectl:1.20.4
image: bitnami/kubectl:1.30.4
command: ["/bin/entrypoint.sh"]
volumeMounts:
- name: entrypoint-volume
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-leg-2-at-only/schedule-only/35-install-pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
restartPolicy: Never
containers:
- name: test
image: bitnami/kubectl:1.20.4
image: bitnami/kubectl:1.30.4
command: ["/bin/entrypoint.sh"]
volumeMounts:
- name: entrypoint-volume
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-leg-2-at-only/schedule-only/40-db-add-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
restartPolicy: Never
containers:
- name: test
image: bitnami/kubectl:1.20.4
image: bitnami/kubectl:1.30.4
command: ["/bin/entrypoint.sh"]
volumeMounts:
- name: entrypoint-volume
Expand Down
Loading
Loading