From cd26faf2822e4d143d2fcf42b0e94f64b8769486 Mon Sep 17 00:00:00 2001 From: James Blair Date: Wed, 25 Oct 2023 23:13:46 +1300 Subject: [PATCH 1/2] Fix runs-on for arm64 robustness. Signed-off-by: James Blair --- .github/workflows/robustness-nightly.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/robustness-nightly.yaml b/.github/workflows/robustness-nightly.yaml index cc1c1928934..09f745d938e 100644 --- a/.github/workflows/robustness-nightly.yaml +++ b/.github/workflows/robustness-nightly.yaml @@ -1,14 +1,14 @@ --- name: Robustness Nightly permissions: read-all -on: +on: pull_request # schedules always run against the main branch, hence we have to create separate jobs # with individual checkout actions for each of the active release branches - schedule: - - cron: '25 9 * * *' # runs every day at 09:25 UTC + #schedule: + # - cron: '25 9 * * *' # runs every day at 09:25 UTC # workflow_dispatch enables manual testing of this job by maintainers - workflow_dispatch: + #workflow_dispatch: jobs: main: @@ -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: @@ -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: From 6dea713f7deb48737c89bea9b3cfa1e23d1a1c9e Mon Sep 17 00:00:00 2001 From: James Blair Date: Thu, 26 Oct 2023 20:52:04 +1300 Subject: [PATCH 2/2] Stop running test workflows in containers. Signed-off-by: James Blair --- .github/workflows/e2e-arm64-template.yaml | 6 ------ .github/workflows/e2e.yaml | 7 ------- .github/workflows/grpcproxy.yaml | 6 ------ .github/workflows/robustness-nightly.yaml | 8 ++++---- .github/workflows/robustness-template.yaml | 12 ++---------- .github/workflows/tests-arm64-template.yaml | 6 ------ .github/workflows/tests.yaml | 6 ------ 7 files changed, 6 insertions(+), 45 deletions(-) diff --git a/.github/workflows/e2e-arm64-template.yaml b/.github/workflows/e2e-arm64-template.yaml index 30fe1c48064..2fad7039786 100644 --- a/.github/workflows/e2e-arm64-template.yaml +++ b/.github/workflows/e2e-arm64-template.yaml @@ -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: @@ -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 diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 53d02dde090..5348c192fb7 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -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: @@ -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 diff --git a/.github/workflows/grpcproxy.yaml b/.github/workflows/grpcproxy.yaml index 00e1ff389bd..2406b83386d 100644 --- a/.github/workflows/grpcproxy.yaml +++ b/.github/workflows/grpcproxy.yaml @@ -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: @@ -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 diff --git a/.github/workflows/robustness-nightly.yaml b/.github/workflows/robustness-nightly.yaml index 09f745d938e..678fd2bf83e 100644 --- a/.github/workflows/robustness-nightly.yaml +++ b/.github/workflows/robustness-nightly.yaml @@ -1,14 +1,14 @@ --- name: Robustness Nightly permissions: read-all -on: pull_request +on: # schedules always run against the main branch, hence we have to create separate jobs # with individual checkout actions for each of the active release branches - #schedule: - # - cron: '25 9 * * *' # runs every day at 09:25 UTC + schedule: + - cron: '25 9 * * *' # runs every day at 09:25 UTC # workflow_dispatch enables manual testing of this job by maintainers - #workflow_dispatch: + workflow_dispatch: jobs: main: diff --git a/.github/workflows/robustness-template.yaml b/.github/workflows/robustness-template.yaml index abf51bd4c26..c8171b267c6 100644 --- a/.github/workflows/robustness-template.yaml +++ b/.github/workflows/robustness-template.yaml @@ -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 @@ -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" diff --git a/.github/workflows/tests-arm64-template.yaml b/.github/workflows/tests-arm64-template.yaml index f4df1dc6e4d..c2a05ca1b8e 100644 --- a/.github/workflows/tests-arm64-template.yaml +++ b/.github/workflows/tests-arm64-template.yaml @@ -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: @@ -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 diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 338c918f233..82081ee2128 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -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: @@ -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