Skip to content

Commit

Permalink
Merge pull request etcd-io#16824 from jmhbnz/fix-robustness-arm64-run…
Browse files Browse the repository at this point in the history
…s-on

Fix arm64 robustness and stop running workflows in containers
  • Loading branch information
serathius authored Oct 26, 2023
2 parents 4d77fd1 + 6dea713 commit 2dc6275
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 43 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/e2e-arm64-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ jobs:
# this is to prevent the job to run at forked projects
if: github.repository == 'etcd-io/etcd'
runs-on: actuated-arm64-8cpu-32gb
container: golang:1.21-bookworm
defaults:
run:
shell: bash
strategy:
fail-fast: false
matrix:
Expand All @@ -25,8 +21,6 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
ref: "${{ inputs.etcdBranch }}"
# https://github.com/actions/checkout/issues/1169
- run: git config --system --add safe.directory '*'
- id: goversion
run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ permissions: read-all
jobs:
test:
runs-on: ubuntu-latest
container:
image: golang:1.21-bookworm
defaults:
run:
shell: bash
strategy:
fail-fast: false
matrix:
Expand All @@ -18,8 +13,6 @@ jobs:
- linux-386-e2e
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
# https://github.com/actions/checkout/issues/1169
- run: git config --system --add safe.directory '*'
- id: goversion
run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/grpcproxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ permissions: read-all
jobs:
test:
runs-on: ubuntu-latest
container: golang:1.21-bookworm
defaults:
run:
shell: bash
strategy:
fail-fast: false
matrix:
Expand All @@ -17,8 +13,6 @@ jobs:
- linux-amd64-grpcproxy-e2e
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
# https://github.com/actions/checkout/issues/1169
- run: git config --system --add safe.directory '*'
- id: goversion
run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/robustness-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
count: 80
testTimeout: 200m
artifactName: main-arm64
runs-on: "['self-hosted', 'Linux', 'ARM64']"
runs-on: "['actuated-arm64-8cpu-32gb']"
release-35:
uses: ./.github/workflows/robustness-template.yaml
with:
Expand All @@ -43,7 +43,7 @@ jobs:
count: 100
testTimeout: 200m
artifactName: release-35-arm64
runs-on: "['self-hosted', 'Linux', 'ARM64']"
runs-on: "['actuated-arm64-8cpu-32gb']"
release-34:
uses: ./.github/workflows/robustness-template.yaml
with:
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/robustness-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,8 @@ jobs:
test:
timeout-minutes: 210
runs-on: ${{ fromJson(inputs.runs-on) }}
container:
image: golang:1.21-bookworm
# Required for mounting fuse lazyfs
options: --privileged
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
# https://github.com/actions/checkout/issues/1169
- run: git config --system --add safe.directory '*'
- id: goversion
run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
Expand All @@ -50,7 +41,8 @@ jobs:
go clean -testcache
# Build LazyFS
apt update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3
sudo apt update && sudo apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3
sudo sed -i 's/#user_allow_other/user_allow_other/g' /etc/fuse.conf
make install-lazyfs
# Use --failfast to avoid overriding report generated by failed test
GO_TEST_FLAGS="-v --count ${{ inputs.count }} --timeout ${{ inputs.testTimeout }} --failfast --run TestRobustness"
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/tests-arm64-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ jobs:
# this is to prevent the job to run at forked projects
if: github.repository == 'etcd-io/etcd'
runs-on: actuated-arm64-8cpu-32gb
container: golang:1.21-bookworm
defaults:
run:
shell: bash
strategy:
fail-fast: false
matrix:
Expand All @@ -33,8 +29,6 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
ref: "${{ inputs.etcdBranch }}"
# https://github.com/actions/checkout/issues/1169
- run: git config --system --add safe.directory '*'
- id: goversion
run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ permissions: read-all
jobs:
test:
runs-on: ubuntu-latest
container: golang:1.21-bookworm
defaults:
run:
shell: bash
strategy:
fail-fast: false
matrix:
Expand All @@ -20,8 +16,6 @@ jobs:
- linux-386-unit-1-cpu
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
# https://github.com/actions/checkout/issues/1169
- run: git config --system --add safe.directory '*'
- id: goversion
run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
Expand Down

0 comments on commit 2dc6275

Please sign in to comment.