Skip to content

Add crust-gather to e2e fail handlers #2842

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
merged 1 commit into from
Sep 13, 2024
Merged

Add crust-gather to e2e fail handlers #2842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 0 additions & 25 deletions .github/scripts/dump-failed-k3ds.sh
View file
Open in desktop

This file was deleted.

30 changes: 15 additions & 15 deletions .github/workflows/e2e-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,28 @@ on:
env:
GOARCH: amd64
CGO_ENABLED: 0
SETUP_K3D_VERSION: 'v5.7.1'
SETUP_K3D_VERSION: 'v5.7.4'

jobs:
e2e-fleet-test:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
k3s_version:
k3s:
# k3d version list k3s | sed 's/+/-/' | sort -h
# https://hub.docker.com/r/rancher/k3s/tags
- v1.30.2-k3s2
- v1.24.17-k3s1
- name: k3s-new
version: v1.30.4-k3s1
- name: k3s-old
version: v1.24.17-k3s1
test_type:
- name: default
- name: sharding
shards: '[{"id":"shard0"},{"id":"shard1"},{"id":"shard2"}]'
- name: infra-setup
name: e2e-fleet-test-${{ matrix.k3s.name }}-${{ matrix.test_type.name }}

steps:
-
uses: actions/checkout@v4
Expand All @@ -41,6 +45,9 @@ jobs:
-
name: Install Ginkgo CLI
run: go install github.com/onsi/ginkgo/v2/ginkgo
-
name: Install crust-gather CLI
run: curl -sSfL https://github.com/crust-gather/crust-gather/raw/main/install.sh | sh -s -- --yes
-
name: Build Fleet
run: |
Expand All @@ -66,7 +73,7 @@ jobs:
args: >-
--agents 1
--network "nw01"
--image docker.io/rancher/k3s:${{matrix.k3s_version}}
--image docker.io/rancher/k3s:${{matrix.k3s.version}}
-
name: Import Images Into k3d
run: |
Expand Down Expand Up @@ -151,7 +158,7 @@ jobs:
GIT_REPO_URL: "git@github.com:fleetrepoci/test.git"
GIT_REPO_HOST: "github.com"
GIT_REPO_USER: "git"
GIT_REPO_BRANCH: ${{ matrix.k3s_version }}
GIT_REPO_BRANCH: ${{ matrix.k3s.version }}
CI_OCI_USERNAME: ${{ secrets.CI_OCI_USERNAME }}
CI_OCI_PASSWORD: ${{ secrets.CI_OCI_PASSWORD }}
run: |
Expand All @@ -161,19 +168,12 @@ jobs:
echo "${{ secrets.CI_SSH_PUBKEY }}" > "$GIT_SSH_PUBKEY"

ginkgo --github-output e2e/require-secrets
-
name: Dump Failed Environment
if: failure()
run: |
mkdir -p tmp
./.github/scripts/dump-failed-k3ds.sh
-
name: Upload Logs
uses: actions/upload-artifact@v4
if: failure()
with:
name: gha-fleet-e2e-logs-${{ github.sha }}-${{ matrix.k3s_version }}-${{ matrix.test_type.name }}-${{ github.run_id }}
name: gha-fleet-e2e-logs-${{ github.sha }}-${{ matrix.k3s.version }}-${{ matrix.test_type.name }}-${{ github.run_id }}
path: |
tmp/*.json
tmp/*.log
tmp/upstream
retention-days: 2
24 changes: 12 additions & 12 deletions .github/workflows/e2e-fleet-upgrade-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,18 @@ on:
env:
GOARCH: amd64
CGO_ENABLED: 0
SETUP_K3D_VERSION: 'v5.7.1'
SETUP_K3D_VERSION: 'v5.7.4'

jobs:
fleet-upgrade-test:
runs-on: ubuntu-latest
strategy:
matrix:
k3s_version:
- v1.30.2-k3s2
k3s:
- name: k3s-new
version: v1.30.4-k3s1
name: fleet-upgrade-test-${{ matrix.k3s.name }}

steps:
-
uses: actions/checkout@v4
Expand All @@ -31,6 +34,9 @@ jobs:
-
name: Install Ginkgo CLI
run: go install github.com/onsi/ginkgo/v2/ginkgo
-
name: Install crust-gather CLI
run: curl -sSfL https://github.com/crust-gather/crust-gather/raw/main/install.sh | sh -s -- --yes
-
name: Provision k3d Cluster
uses: AbsaOSS/k3d-action@v2
Expand All @@ -41,7 +47,7 @@ jobs:
args: >-
--agents 1
--network "nw01"
--image docker.io/rancher/k3s:${{matrix.k3s_version}}
--image docker.io/rancher/k3s:${{matrix.k3s.version}}
-
name: Deploy Latest Release
run: |
Expand Down Expand Up @@ -77,18 +83,12 @@ jobs:
FLEET_E2E_NS: fleet-local
run: |
ginkgo --github-output --label-filter="!multi-cluster" e2e/installation
-
name: Dump Failed Environment
if: failure()
run: |
./.github/scripts/dump-failed-k3ds.sh
-
name: Upload Logs
uses: actions/upload-artifact@v4
if: failure()
with:
name: gha-fleet-e2e-logs-${{ github.sha }}-${{ matrix.k3s_version }}-${{ github.run_id }}
name: gha-fleet-e2e-logs-${{ github.sha }}-${{ matrix.k3s.version }}-${{ github.run_id }}
path: |
tmp/*.json
tmp/*.log
tmp/upstream
retention-days: 2
14 changes: 9 additions & 5 deletions .github/workflows/e2e-multicluster-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
env:
GOARCH: amd64
CGO_ENABLED: 0
SETUP_K3D_VERSION: 'v5.7.1'
SETUP_K3D_VERSION: 'v5.7.4'

jobs:
e2e-fleet-mc-test:
Expand All @@ -31,6 +31,9 @@ jobs:
-
name: Install Ginkgo CLI
run: go install github.com/onsi/ginkgo/v2/ginkgo
-
name: Install crust-gather CLI
run: curl -sSfL https://github.com/crust-gather/crust-gather/raw/main/install.sh | sh -s -- --yes
-
name: Build Fleet Binaries
run: |
Expand Down Expand Up @@ -209,17 +212,18 @@ jobs:
run: |
ginkgo --github-output e2e/acceptance/multi-cluster-examples
-
name: Dump Failed Environment
name: Dump Failed Downstream Environment
if: failure()
run: |
./.github/scripts/dump-failed-k3ds.sh
kubectl config use-context k3d-downstream
crust-gather collect --exclude-namespace=kube-system --exclude-kind=Lease --duration=5s -f tmp/downstream
-
name: Upload Logs
uses: actions/upload-artifact@v4
if: failure()
with:
name: gha-fleet-mc-e2e-logs-${{ github.sha }}-${{ github.run_id }}
path: |
tmp/*.json
tmp/*.log
tmp/downstream
tmp/upstream
retention-days: 2
18 changes: 7 additions & 11 deletions .github/workflows/e2e-nightly-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ on:
env:
GOARCH: amd64
CGO_ENABLED: 0
SETUP_K3D_VERSION: 'v5.7.1'
SETUP_K3D_VERSION: 'v5.7.4'

jobs:
e2e-fleet-test:
e2e-fleet-nightly-test:
runs-on: ubuntu-latest
strategy:
matrix:
k3s_version:
# k3d version list k3s | sed 's/+/-/' | sort -h
# https://hub.docker.com/r/rancher/k3s/tags
- v1.30.2-k3s2
- v1.30.4-k3s1
- v1.27.5-k3s1
- v1.24.17-k3s1
test_type:
Expand All @@ -39,6 +39,9 @@ jobs:
-
name: Install Ginkgo CLI
run: go install github.com/onsi/ginkgo/v2/ginkgo
-
name: Install crust-gather CLI
run: curl -sSfL https://github.com/crust-gather/crust-gather/raw/main/install.sh | sh -s -- --yes
-
name: Build Fleet Binaries
run: |
Expand Down Expand Up @@ -141,19 +144,12 @@ jobs:
echo "${{ secrets.CI_SSH_PUBKEY }}" > "$GIT_SSH_PUBKEY"

ginkgo --github-output e2e/require-secrets
-
name: Dump Failed Environment
if: failure()
run: |
mkdir -p tmp
./.github/scripts/dump-failed-k3ds.sh
-
name: Upload Logs
uses: actions/upload-artifact@v4
if: failure()
with:
name: gha-nightly-e2e-logs-${{ github.sha }}-${{ matrix.k3s_version }}-${{ github.run_id }}
path: |
tmp/*.json
tmp/*.log
tmp/upstream
retention-days: 2
16 changes: 10 additions & 6 deletions .github/workflows/e2e-rancher-upgrade-fleet-to-head-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ on:
env:
GOARCH: amd64
CGO_ENABLED: 0
SETUP_K3D_VERSION: 'v5.7.1'
SETUP_K3S_VERSION: 'v1.30.2-k3s2'
SETUP_K3D_VERSION: 'v5.7.4'
SETUP_K3S_VERSION: 'v1.30.4-k3s1'

jobs:
rancher-fleet-integration:
Expand All @@ -40,6 +40,9 @@ jobs:
-
name: Install Ginkgo CLI
run: go install github.com/onsi/ginkgo/v2/ginkgo
-
name: Install crust-gather CLI
run: curl -sSfL https://github.com/crust-gather/crust-gather/raw/main/install.sh | sh -s -- --yes
-
uses: actions/cache@v4
id: rancher-cli-cache
Expand Down Expand Up @@ -173,17 +176,18 @@ jobs:
kubectl config use-context k3d-upstream
ginkgo --github-output e2e/multi-cluster
-
name: Dump failed environment
name: Dump Failed Downstream Environment
if: failure()
run: |
./.github/scripts/dump-failed-k3ds.sh
kubectl config use-context k3d-downstream
crust-gather collect --exclude-namespace=kube-system --exclude-kind=Lease --duration=5s -f tmp/downstream
-
name: Upload logs
uses: actions/upload-artifact@v4
if: failure()
with:
name: gha-fleet-rancher-logs-${{ github.sha }}-${{ github.run_id }}
path: |
tmp/*.json
tmp/*.log
tmp/downstream
tmp/upstream
retention-days: 2
14 changes: 9 additions & 5 deletions .github/workflows/e2e-rancher-upgrade-fleet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ on:
env:
GOARCH: amd64
CGO_ENABLED: 0
SETUP_K3D_VERSION: 'v5.7.1'
SETUP_K3D_VERSION: 'v5.7.4'

jobs:
rancher-fleet-upgrade:
Expand All @@ -58,6 +58,9 @@ jobs:
-
name: Install Ginkgo CLI
run: go install github.com/onsi/ginkgo/v2/ginkgo
-
name: Install crust-gather CLI
run: curl -sSfL https://github.com/crust-gather/crust-gather/raw/main/install.sh | sh -s -- --yes
-
uses: actions/cache@v4
id: rancher-cli-cache
Expand Down Expand Up @@ -171,17 +174,18 @@ jobs:
run: |
ginkgo --github-output e2e/multi-cluster
-
name: Dump failed environment
name: Dump Failed Downstream Environment
if: failure()
run: |
./.github/scripts/dump-failed-k3ds.sh
kubectl config use-context k3d-downstream
crust-gather collect --exclude-namespace=kube-system --exclude-kind=Lease --duration=5s -f tmp/downstream
-
name: Upload logs
uses: actions/upload-artifact@v4
if: failure()
with:
name: gha-fleet-upgrade-rancher-logs-${{ github.event.inputs.rancher_version }}-${{ github.event.inputs.k3s_version }}-${{ github.sha }}-${{ github.run_id }}
path: |
tmp/*.json
tmp/*.log
tmp/downstream
tmp/upstream
retention-days: 2
2 changes: 1 addition & 1 deletion e2e/acceptance/multi-cluster-examples/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
)

func TestE2E(t *testing.T) {
RegisterFailHandler(Fail)
RegisterFailHandler(testenv.FailAndGather)
RunSpecs(t, "E2E Suite for Multi-Cluster Examples")
}

Expand Down
2 changes: 1 addition & 1 deletion e2e/acceptance/single-cluster-examples/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
)

func TestE2E(t *testing.T) {
RegisterFailHandler(Fail)
RegisterFailHandler(testenv.FailAndGather)
RunSpecs(t, "E2E Suite for Single-Cluster Examples")
}

Expand Down
2 changes: 1 addition & 1 deletion e2e/drift/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
)

func TestE2E(t *testing.T) {
RegisterFailHandler(Fail)
RegisterFailHandler(testenv.FailAndGather)
RunSpecs(t, "E2E Suite for drift correction")
}

Expand Down
2 changes: 1 addition & 1 deletion e2e/installation/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
)

func TestE2E(t *testing.T) {
RegisterFailHandler(Fail)
RegisterFailHandler(testenv.FailAndGather)
RunSpecs(t, "Verify Fleet Installation")
}

Expand Down
2 changes: 1 addition & 1 deletion e2e/keep-resources/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
)

func TestE2E(t *testing.T) {
RegisterFailHandler(Fail)
RegisterFailHandler(testenv.FailAndGather)
RunSpecs(t, "E2E Suite for keepResources")
}

Expand Down
Loading
Loading