Merge pull request #16407 from jmhbnz/consolidate-robustness-templates

Consolidate robustness github actions templates

.github/workflows/robustness-nightly.yaml

@@ -16,7 +16,7 @@ jobs:
       testTimeout: 200m
       artifactName: main
   main-arm64:
-    uses: ./.github/workflows/robustness-template-arm64.yaml
+    uses: ./.github/workflows/robustness-template.yaml
     with:
       etcdBranch: main
       count: 80
@@ -31,12 +31,13 @@ jobs:
       testTimeout: 200m
       artifactName: release-35
   release-35-arm64:
-    uses: ./.github/workflows/robustness-template-arm64.yaml
+    uses: ./.github/workflows/robustness-template.yaml
     with:
       etcdBranch: release-3.5
       count: 100
       testTimeout: 200m
       artifactName: release-35-arm64
+      runs-on: "['self-hosted', 'Linux', 'ARM64']"
   release-34:
     uses: ./.github/workflows/robustness-template.yaml
     with:

.github/workflows/robustness-template-arm64.yaml

@@ -1,78 +0,0 @@
----
-name: Reusable Robustness Workflow
-on:
-  workflow_call:
-    inputs:
-      etcdBranch:
-        required: true
-        type: string
-      count:
-        required: true
-        type: number
-      testTimeout:
-        required: false
-        type: string
-        default: '30m'
-      artifactName:
-        required: true
-        type: string
-      runs-on:
-        required: false
-        type: string
-        default: "['ubuntu-latest']"
-permissions: read-all
-
-jobs:
-  test:
-    timeout-minutes: 210
-    runs-on: ${{ fromJson(inputs.runs-on) }}
-    container:
-      image: golang:1.20-bullseye
-      # Required for mounting fuse lazyfs
-      options: --privileged
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      # 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
-        with:
-          go-version: ${{ steps.goversion.outputs.goversion }}
-      - name: test-robustness
-        env:
-          ETCD_BRANCH: "${{ inputs.etcdBranch }}"
-        run: |
-          set -euo pipefail
-          go clean -testcache
-
-          # Build LazyFS
-          apt update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3
-          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"
-          case "${ETCD_BRANCH}" in
-            release-3.5)
-              EXPECT_DEBUG=true GO_TEST_FLAGS=${GO_TEST_FLAGS} RESULTS_DIR=/tmp/results make test-robustness-release-3.5
-              ;;
-            release-3.4)
-              EXPECT_DEBUG=true GO_TEST_FLAGS=${GO_TEST_FLAGS} RESULTS_DIR=/tmp/results make test-robustness-release-3.4
-              ;;
-            main)
-              make gofail-enable
-              make build
-              EXPECT_DEBUG=true GO_TEST_FLAGS=${GO_TEST_FLAGS} RESULTS_DIR=/tmp/results make test-robustness
-              ;;
-            *)
-              echo "Failed to find target ${ETCD_BRANCH}"
-              exit 1
-              ;;
-          esac
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        if: always()
-        with:
-          name: ${{ inputs.artifactName }}
-          path: /tmp/results/*

.github/workflows/robustness-template.yaml

@@ -21,12 +21,22 @@ on:
         type: string
         default: "['ubuntu-latest']"
 permissions: read-all
+
 jobs:
   test:
     timeout-minutes: 210
     runs-on: ${{ fromJson(inputs.runs-on) }}
+    container:
+      image: golang:1.20-bullseye
+      # Required for mounting fuse lazyfs
+      options: --privileged
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      # 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
@@ -40,9 +50,8 @@ jobs:
           go clean -testcache
 
           # Build LazyFS
-          sudo apt-get -y install cmake libfuse3-dev libfuse3-3 fuse3
+          apt update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3
           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"
           case "${ETCD_BRANCH}" in