Skip to content

USHIFT-966 USHIFT-973: microshift e2e test suite #37629

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 25 commits into from
Apr 18, 2023
Merged

USHIFT-966 USHIFT-973: microshift e2e test suite #37629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e887ac9
microshift-e2e
pmtk Mar 23, 2023
8f6c17e
provide firewall functions
pmtk Mar 30, 2023
37298d2
add cli
pmtk Mar 30, 2023
c042bb3
use user that's configured for ssh
pmtk Mar 30, 2023
d7c7297
setup openssh client
pmtk Mar 31, 2023
54d6c27
try handling ssh keys another way
pmtk Mar 31, 2023
ef615bc
best debug method known to men
pmtk Mar 31, 2023
00c2e44
get remote host pubkey
pmtk Mar 31, 2023
b0f6d1c
move getting IP to correct place
pmtk Mar 31, 2023
48f9595
export INSTANCE_PREFIX to use with firewall funcs
pmtk Mar 31, 2023
1b1fb56
rebase owners
pmtk Mar 31, 2023
7c9d4e8
python test runner
pmtk Apr 1, 2023
47f9c20
bring back bash test runner
pmtk Apr 3, 2023
b9785d4
use from o/m
pmtk Apr 12, 2023
1b79f1c
changes to accomodate e2e and getting carried away
pmtk Apr 13, 2023
53479d1
bring back old cluster-debug-info execution
pmtk Apr 14, 2023
8c0930e
export KUBECONFIG for cluster-debug-info.sh
pmtk Apr 14, 2023
874d0e5
obtain IP afterr starting instance
pmtk Apr 15, 2023
3fe3ba0
add some lvm debug commands
pmtk Apr 15, 2023
f852caa
4.12 has spare-gb: 10, so provisioning pvc fails
pmtk Apr 15, 2023
81438df
fix ssh - missing target
pmtk Apr 15, 2023
e12b984
add ServerAlive{Interval,CountMax}
pmtk Apr 15, 2023
8f39c21
after reboot IP changes...
pmtk Apr 15, 2023
c5c6936
don't `oc wait` immediatelly after starting
pmtk Apr 16, 2023
d9914cf
standalone ssh reboot to keep exit codes separate
pmtk Apr 16, 2023
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
86 changes: 9 additions & 77 deletions ci-operator/config/openshift/microshift/openshift-microshift-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,15 @@ images:
FROM src as rpms
RUN dnf install --setopt=tsflags=nodocs -y selinux-policy-devel
RUN make rpm && TARGET_ARCH=aarch64 make rpm
RUN tar cvf /rpms.tar -C _output/rpmbuild/RPMS/ .

FROM test-runtime
USER root
ENV HOME=/tmp/secret
ENV PAYLOAD_PATH=$HOME/payload
WORKDIR $PAYLOAD_PATH

COPY oc openshift-tests usr/bin/
RUN chmod 755 usr/bin/oc && ln -rs usr/bin/oc usr/bin/kubectl
COPY oc openshift-tests /usr/bin/
RUN ln -rs /usr/bin/oc /usr/bin/kubectl

COPY validate-microshift /tmp/validate-microshift
COPY busybox_running_check.sh configure-vm.sh usr/bin/
RUN chmod 755 usr/bin/configure-vm.sh usr/bin/busybox_running_check.sh

COPY --from=rpms /go/src/github.com/openshift/microshift/_output/rpmbuild/RPMS/*/*.rpm packages/
RUN tar -cvf payload.tar . && chmod -R a+rw "${HOME}"
COPY microshift /microshift
COPY --from=rpms /rpms.tar /rpms.tar
inputs:
cli:
paths:
Expand All @@ -64,12 +57,6 @@ images:
- src
paths:
- destination_dir: .
source_path: /go/src/github.com/openshift/microshift/scripts/devenv-builder/configure-vm.sh
- destination_dir: .
source_path: /go/src/github.com/openshift/microshift/validate-microshift
- destination_dir: .
source_path: /go/src/github.com/openshift/microshift/docs/config/busybox_running_check.sh
- destination_dir: ./microshift
source_path: /go/src/github.com/openshift/microshift
test-bin:
paths:
Expand Down Expand Up @@ -150,52 +137,16 @@ tests:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306
GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4
workflow: openshift-microshift-e2e-openshift-conformance-reduced
- as: e2e-reboot
cluster: build02
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile)
steps:
cluster_profile: gcp
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
workflow: openshift-microshift-e2e-reboot-tests
- as: e2e-reboot-arm
cluster: build02
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile)
steps:
cluster_profile: gcp
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306
GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4
workflow: openshift-microshift-e2e-reboot-tests
- as: e2e-greenboot
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|scripts/.*|vendor/.*|go\.sum|go\.mod|Makefile)
steps:
cluster_profile: gcp
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
workflow: openshift-microshift-e2e-greenboot
- as: e2e-greenboot-arm
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|scripts/.*|vendor/.*|go\.sum|go\.mod|Makefile)
steps:
cluster_profile: gcp
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306
GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4
workflow: openshift-microshift-e2e-greenboot
- as: e2e-router-smoke-test
- as: microshift-e2e
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh)
steps:
cluster_profile: gcp
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
workflow: openshift-microshift-e2e-router-smoke-test
- as: e2e-router-smoke-test-arm
workflow: openshift-microshift-e2e-microshift-tests
- as: microshift-e2e-arm
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh)
Expand All @@ -204,30 +155,11 @@ tests:
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306
GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4
workflow: openshift-microshift-e2e-router-smoke-test
workflow: openshift-microshift-e2e-microshift-tests
- as: rebase-on-nightlies
cron: 0 5 * * 1-5
steps:
workflow: openshift-microshift-rebase
- as: e2e-loadbalancer-smoke-test
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh)
steps:
cluster_profile: gcp
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
workflow: openshift-microshift-e2e-loadbalancer-smoke-test
- as: e2e-loadbalancer-smoke-test-arm
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh)
steps:
cluster_profile: gcp
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306
GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4
workflow: openshift-microshift-e2e-loadbalancer-smoke-test
zz_generated_metadata:
branch: main
org: openshift
Expand Down
21 changes: 5 additions & 16 deletions ci-operator/config/openshift/microshift/openshift-microshift-release-4.12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,15 @@ images:
FROM src as rpms
RUN dnf install --setopt=tsflags=nodocs -y selinux-policy-devel
RUN make rpm
RUN tar cvf /rpms.tar -C _output/rpmbuild/RPMS/ .

FROM test-runtime
USER root
ENV HOME=/tmp/secret
ENV PAYLOAD_PATH=$HOME/payload
WORKDIR $PAYLOAD_PATH

COPY oc openshift-tests usr/bin/
RUN chmod 755 usr/bin/oc && ln -rs usr/bin/oc usr/bin/kubectl
COPY oc openshift-tests /usr/bin/
RUN ln -rs /usr/bin/oc /usr/bin/kubectl

COPY validate-microshift /tmp/validate-microshift
COPY configure-vm.sh usr/bin/
RUN chmod 755 usr/bin/configure-vm.sh

COPY --from=rpms /go/src/github.com/openshift/microshift/_output/rpmbuild/RPMS/*/*.rpm packages/
RUN tar -cvf payload.tar . && chmod -R a+rw "${HOME}"
COPY microshift /microshift
COPY --from=rpms /rpms.tar /rpms.tar
inputs:
cli:
paths:
Expand All @@ -64,10 +57,6 @@ images:
- src
paths:
- destination_dir: .
source_path: /go/src/github.com/openshift/microshift/scripts/devenv-builder/configure-vm.sh
- destination_dir: .
source_path: /go/src/github.com/openshift/microshift/validate-microshift
- destination_dir: ./microshift
source_path: /go/src/github.com/openshift/microshift
test-bin:
paths:
Expand Down
23 changes: 5 additions & 18 deletions ci-operator/config/openshift/microshift/openshift-microshift-release-4.13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,15 @@ images:
FROM src as rpms
RUN dnf install --setopt=tsflags=nodocs -y selinux-policy-devel
RUN make rpm && TARGET_ARCH=aarch64 make rpm
RUN tar cvf /rpms.tar -C _output/rpmbuild/RPMS/ .

FROM test-runtime
USER root
ENV HOME=/tmp/secret
ENV PAYLOAD_PATH=$HOME/payload
WORKDIR $PAYLOAD_PATH

COPY oc openshift-tests usr/bin/
RUN chmod 755 usr/bin/oc && ln -rs usr/bin/oc usr/bin/kubectl
COPY oc openshift-tests /usr/bin/
RUN ln -rs /usr/bin/oc /usr/bin/kubectl

COPY validate-microshift /tmp/validate-microshift
COPY busybox_running_check.sh configure-vm.sh usr/bin/
RUN chmod 755 usr/bin/configure-vm.sh usr/bin/busybox_running_check.sh

COPY --from=rpms /go/src/github.com/openshift/microshift/_output/rpmbuild/RPMS/*/*.rpm packages/
RUN tar -cvf payload.tar . && chmod -R a+rw "${HOME}"
COPY microshift /microshift
COPY --from=rpms /rpms.tar /rpms.tar
inputs:
cli:
paths:
Expand All @@ -64,12 +57,6 @@ images:
- src
paths:
- destination_dir: .
source_path: /go/src/github.com/openshift/microshift/scripts/devenv-builder/configure-vm.sh
- destination_dir: .
source_path: /go/src/github.com/openshift/microshift/validate-microshift
- destination_dir: .
source_path: /go/src/github.com/openshift/microshift/docs/config/busybox_running_check.sh
- destination_dir: ./microshift
source_path: /go/src/github.com/openshift/microshift
test-bin:
paths:
Expand Down
86 changes: 9 additions & 77 deletions ci-operator/config/openshift/microshift/openshift-microshift-release-4.14.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,15 @@ images:
FROM src as rpms
RUN dnf install --setopt=tsflags=nodocs -y selinux-policy-devel
RUN make rpm && TARGET_ARCH=aarch64 make rpm
RUN tar cvf /rpms.tar -C _output/rpmbuild/RPMS/ .

FROM test-runtime
USER root
ENV HOME=/tmp/secret
ENV PAYLOAD_PATH=$HOME/payload
WORKDIR $PAYLOAD_PATH

COPY oc openshift-tests usr/bin/
RUN chmod 755 usr/bin/oc && ln -rs usr/bin/oc usr/bin/kubectl
COPY oc openshift-tests /usr/bin/
RUN ln -rs /usr/bin/oc /usr/bin/kubectl

COPY validate-microshift /tmp/validate-microshift
COPY busybox_running_check.sh configure-vm.sh usr/bin/
RUN chmod 755 usr/bin/configure-vm.sh usr/bin/busybox_running_check.sh

COPY --from=rpms /go/src/github.com/openshift/microshift/_output/rpmbuild/RPMS/*/*.rpm packages/
RUN tar -cvf payload.tar . && chmod -R a+rw "${HOME}"
COPY microshift /microshift
COPY --from=rpms /rpms.tar /rpms.tar
inputs:
cli:
paths:
Expand All @@ -64,12 +57,6 @@ images:
- src
paths:
- destination_dir: .
source_path: /go/src/github.com/openshift/microshift/scripts/devenv-builder/configure-vm.sh
- destination_dir: .
source_path: /go/src/github.com/openshift/microshift/validate-microshift
- destination_dir: .
source_path: /go/src/github.com/openshift/microshift/docs/config/busybox_running_check.sh
- destination_dir: ./microshift
source_path: /go/src/github.com/openshift/microshift
test-bin:
paths:
Expand Down Expand Up @@ -151,71 +138,16 @@ tests:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306
GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4
workflow: openshift-microshift-e2e-openshift-conformance-reduced
- as: e2e-reboot
cluster: build02
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile)
steps:
cluster_profile: gcp
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
workflow: openshift-microshift-e2e-reboot-tests
- as: e2e-reboot-arm
cluster: build02
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile)
steps:
cluster_profile: gcp
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306
GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4
workflow: openshift-microshift-e2e-reboot-tests
- as: e2e-greenboot
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|scripts/.*|vendor/.*|go\.sum|go\.mod|Makefile)
steps:
cluster_profile: gcp
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
workflow: openshift-microshift-e2e-greenboot
- as: e2e-greenboot-arm
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|scripts/.*|vendor/.*|go\.sum|go\.mod|Makefile)
steps:
cluster_profile: gcp
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306
GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4
workflow: openshift-microshift-e2e-greenboot
- as: e2e-router-smoke-test
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh)
steps:
cluster_profile: gcp
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
workflow: openshift-microshift-e2e-router-smoke-test
- as: e2e-router-smoke-test-arm
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh)
steps:
cluster_profile: gcp
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306
GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4
workflow: openshift-microshift-e2e-router-smoke-test
- as: e2e-loadbalancer-smoke-test
- as: microshift-e2e
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh)
steps:
cluster_profile: gcp
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-v20230203
workflow: openshift-microshift-e2e-loadbalancer-smoke-test
- as: e2e-loadbalancer-smoke-test-arm
workflow: openshift-microshift-e2e-microshift-tests
- as: microshift-e2e-arm
cluster: build02
optional: true
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|vendor/.*|go\.sum|go\.mod|Makefile|.*\.sh)
Expand All @@ -224,7 +156,7 @@ tests:
env:
GOOGLE_COMPUTE_IMAGE_NAME: rhel-9-arm64-v20230306
GOOGLE_COMPUTE_MACHINE_TYPE: t2a-standard-4
workflow: openshift-microshift-e2e-loadbalancer-smoke-test
workflow: openshift-microshift-e2e-microshift-tests
zz_generated_metadata:
branch: release-4.14
org: openshift
Expand Down
Loading