Skip to content

Commit

Permalink
[Release-1.24] Consolidate E2E tests (#6888)
Browse files Browse the repository at this point in the history
* Consolidate E2E tests and GH Actions (#6772)

* Consolidate cluster reset and snapshot E2E tests
* Add more context to secrets-encryption test
* Reuse build workflow
* Convert updatecli to job level permissions
* Remove dweomer microos from E2E and install testing

Signed-off-by: Derek Nola <[email protected]>

* E2E: Consoldiate docker and prefer bundled tests into new startup test (#6851)

* Convert docker E2E to startup E2E
* Move preferedbundled into the e2e startup test

Signed-off-by: Derek Nola <[email protected]>

---------

Signed-off-by: Derek Nola <[email protected]>
  • Loading branch information
dereknola authored Feb 7, 2023
1 parent 1b5a3a5 commit 3052853
Show file tree
Hide file tree
Showing 17 changed files with 445 additions and 744 deletions.
21 changes: 5 additions & 16 deletions .github/workflows/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,18 @@ on:
- "channel.yaml"
- "install.sh"
- "tests/install/**"
- ".github/workflows/install.yaml"

pull_request:
branches: [main, master]
paths:
- "install.sh"
- "tests/install/**"
- ".github/workflows/install.yaml"
workflow_dispatch: {}
jobs:
build:
name: Build
runs-on: ubuntu-20.04
timeout-minutes: 20
steps:
- name: "Checkout"
uses: actions/checkout@v3
with:
fetch-depth: 1
- name: "Make"
run: DOCKER_BUILDKIT=1 SKIP_VALIDATE=1 make
- name: "Upload k3s binary"
uses: actions/upload-artifact@v3
with:
name: k3s
path: ./dist/artifacts/k3s
uses: ./.github/workflows/build-k3s.yaml
test:
name: "Smoke Test"
needs: build
Expand All @@ -37,7 +26,7 @@ jobs:
strategy:
fail-fast: false
matrix:
vm: [centos-7, rocky-8, fedora, opensuse-leap, opensuse-microos, ubuntu-focal]
vm: [centos-7, rocky-8, fedora, opensuse-leap, ubuntu-focal]
max-parallel: 2
defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
channel: [v1.24]
vm: [centos-7, rocky-8, fedora-coreos, opensuse-leap, opensuse-microos, ubuntu-focal]
vm: [centos-7, rocky-8, fedora, opensuse-leap, ubuntu-focal]
max-parallel: 2
defaults:
run:
Expand Down
17 changes: 3 additions & 14 deletions .github/workflows/snapshotter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,11 @@ on:
- "!.github/workflows/snapshotter.yaml"
workflow_dispatch: {}
jobs:
prep:
name: "Prepare"
runs-on: ubuntu-20.04
timeout-minutes: 40
steps:
- name: "Checkout"
uses: actions/checkout@v3
with: { fetch-depth: 1 }
- name: "Build"
run: DOCKER_BUILDKIT=1 SKIP_VALIDATE=1 make
- name: "Upload Binary"
uses: actions/upload-artifact@v3
with: { name: k3s, path: dist/artifacts/k3s }
build:
uses: ./.github/workflows/build-k3s.yaml
test:
name: "Smoke Test"
needs: prep
needs: build
# nested virtualization is only available on macOS hosts
runs-on: macos-12
timeout-minutes: 40
Expand Down
136 changes: 0 additions & 136 deletions tests/e2e/clusterreset/Vagrantfile

This file was deleted.

Loading

0 comments on commit 3052853

Please sign in to comment.