Skip to content

Commit

Permalink
Merge branch 'main' into add-api-version
Browse files Browse the repository at this point in the history
  • Loading branch information
AustinAbro321 authored Aug 5, 2024
2 parents cb0fb33 + b415e0e commit b716d1c
Show file tree
Hide file tree
Showing 9 changed files with 56 additions and 21 deletions.
8 changes: 7 additions & 1 deletion .github/actions/cleanup-files/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,16 @@ runs:
- run: |
lsblk -f
echo "removing some github actions pre-installed tools to save space"
sudo rm -rf /usr/share/dotnet
sudo rm -rf /opt/ghc
sudo rm -rf /opt/hostedtoolcache/CodeQL
sudo docker system prune --all --force
echo "removing zarf sboms, packages, cache"
sudo rm -rf zarf-sbom /tmp/zarf-*
sudo env "PATH=$PATH" CI=true make delete-packages
sudo build/zarf tools clear-cache
sudo docker system prune --all --force
lsblk -f
shell: bash
22 changes: 22 additions & 0 deletions .github/actions/debug-cluster/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: debug-cluster
description: "Setup Go binary and caching"

runs:
using: composite
steps:
- run: |
echo "***** Getting pods *****"
kubectl get pods -A
echo "***** Getting pods yaml *****"
kubectl get pods -A -o yaml
echo "***** Describing pods *****"
kubectl describe pods -A
echo "***** Getting nodes *****"
kubectl get nodes -A
echo "***** describing nodes *****"
kubectl describe nodes -A
shell: bash
16 changes: 2 additions & 14 deletions .github/workflows/nightly-eks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,9 @@ jobs:
- name: Run tests
run: make test-e2e-with-cluster ARCH=amd64

- name: get pods
- name: show cluster logs
uses: ./.github/actions/debug-cluster
if: always()
run: kubectl get pods -n kiwix -o yaml

- name: describe pod
if: always()
run: kubectl describe pods -n kiwix

- name: get nodes
if: always()
run: kubectl get nodes -o yaml

- name: describe nodes
if: always()
run: kubectl describe nodes

- name: Teardown the cluster
if: always()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:

# Upload the contents of the build directory for later stages to use
- name: Upload build artifacts
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: build-artifacts
path: build/
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
HOMEBREW_TAP_GITHUB_TOKEN: ${{ steps.brew-tap-token.outputs.token }}

- name: Save CVE report
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: cve-report
path: build/zarf-known-cves.csv
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: SARIF file
path: results.sarif
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-bigbang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:

# Upload the contents of the build directory for later stages to use
- name: Upload build artifacts
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: build-artifacts
path: build/
Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

# Upload the contents of the build directory for later stages to use
- name: Upload build artifacts
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: build-artifacts
path: build/
Expand Down Expand Up @@ -119,6 +119,10 @@ jobs:
run: |
make test-e2e-with-cluster ARCH=amd64
- name: get cluster info
uses: ./.github/actions/debug-cluster
if: always()

- name: Save logs
if: always()
uses: ./.github/actions/save-logs
Expand Down Expand Up @@ -197,6 +201,10 @@ jobs:
run: |
make test-e2e-with-cluster ARCH=amd64
- name: get cluster info
uses: ./.github/actions/debug-cluster
if: always()

- name: Save logs
if: always()
uses: ./.github/actions/save-logs
Expand Down Expand Up @@ -235,6 +243,10 @@ jobs:
run: |
make test-e2e-with-cluster ARCH=amd64
- name: get cluster info
uses: ./.github/actions/debug-cluster
if: always()

- name: Save logs
if: always()
uses: ./.github/actions/save-logs
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/test-external.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,16 @@ jobs:
- name: Setup k3d
uses: ./.github/actions/k3d

- name: Cleanup files
uses: ./.github/actions/cleanup-files

- name: Run external service test
run: make test-external

- name: get cluster info
uses: ./.github/actions/debug-cluster
if: always()

- name: Save logs
if: always()
uses: ./.github/actions/save-logs
2 changes: 1 addition & 1 deletion .github/workflows/test-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

# Upload the contents of the build directory for later stages to use
- name: Upload build artifacts
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
with:
name: build-artifacts
path: build/
Expand Down

0 comments on commit b716d1c

Please sign in to comment.