From 6c1f8836386cf06d9926fb5bf3de851eeeff0c27 Mon Sep 17 00:00:00 2001 From: James Blair Date: Wed, 28 Jun 2023 17:11:26 +1200 Subject: [PATCH] Revert "Merge pull request #16119 from natusameer/release-3.5" This reverts commit cb38980e2012ecff5e525e7d61cf23ee843b305d, reversing changes made to f565a94844576391beed88a31403d796c31b84e3. Changes reversed as scheduled github actions must exist in default branch. Signed-off-by: James Blair --- .github/workflows/e2e-arm64.yaml | 43 ----------------------- .github/workflows/tests-arm64.yaml | 56 ------------------------------ 2 files changed, 99 deletions(-) delete mode 100644 .github/workflows/e2e-arm64.yaml delete mode 100644 .github/workflows/tests-arm64.yaml diff --git a/.github/workflows/e2e-arm64.yaml b/.github/workflows/e2e-arm64.yaml deleted file mode 100644 index 531bb20e8..000000000 --- a/.github/workflows/e2e-arm64.yaml +++ /dev/null @@ -1,43 +0,0 @@ -name: E2E-arm64 -on: - schedule: - - cron: '30 1 * * *' # runs daily at 1am. -permissions: read-all -jobs: - test: - if: github.repository == 'etcd-io/etcd' - runs-on: [self-hosted, Linux, ARM64] - container: golang:1.19-bullseye - defaults: - run: - shell: bash - strategy: - fail-fast: true - matrix: - target: - - linux-arm64-e2e - steps: - - uses: actions/checkout@v2 - - run: git config --system --add safe.directory '*' - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - - uses: actions/setup-go@v2 - with: - go-version: ${{ steps.goversion.outputs.goversion }} - - run: date - - env: - TARGET: ${{ matrix.target }} - run: | - set -euo pipefail - go clean -testcache - - echo "${TARGET}" - case "${TARGET}" in - linux-arm64-e2e) - PASSES='build e2e' GOOS=linux GOARCH=arm64 CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' ./test.sh - ;; - *) - echo "Failed to find target" - exit 1 - ;; - esac diff --git a/.github/workflows/tests-arm64.yaml b/.github/workflows/tests-arm64.yaml deleted file mode 100644 index ebd37efd0..000000000 --- a/.github/workflows/tests-arm64.yaml +++ /dev/null @@ -1,56 +0,0 @@ -name: Tests-arm64 -on: - schedule: - - cron: '30 1 * * *' # runs daily at 1am. -permissions: read-all -jobs: - test: - # this is to prevent the job to run at forked projects - if: github.repository == 'etcd-io/etcd' - runs-on: [self-hosted, Linux, ARM64] - container: golang:1.19-bullseye - defaults: - run: - shell: bash - strategy: - fail-fast: false - matrix: - target: - - linux-arm64-integration-1-cpu - - linux-arm64-integration-2-cpu - - linux-arm64-integration-4-cpu - - linux-arm64-unit-4-cpu-race - steps: - - uses: actions/checkout@v2 - - run: git config --system --add safe.directory '*' - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - - uses: actions/setup-go@v2 - with: - go-version: ${{ steps.goversion.outputs.goversion }} - - env: - TARGET: ${{ matrix.target }} - run: | - set -euo pipefail - go clean -testcache - - mkdir "${TARGET}" - export JUNIT_REPORT_DIR=$(realpath ${TARGET}) - case "${TARGET}" in - linux-arm64-integration-1-cpu) - GOARCH=arm64 CPU=1 PASSES='integration' RACE='false' ./test.sh - ;; - linux-arm64-integration-2-cpu) - GOARCH=arm64 CPU=2 PASSES='integration' RACE='false' ./test.sh - ;; - linux-arm64-integration-4-cpu) - GOARCH=arm64 CPU=4 PASSES='integration' RACE='false' ./test.sh - ;; - linux-arm64-unit-4-cpu-race) - GOARCH=arm64 PASSES='unit' RACE='true' CPU='4' ./test.sh -p=2 - ;; - *) - echo "Failed to find target" - exit 1 - ;; - esac