Skip to content

Commit 7d0cdd0

Browse files
Copiloteddyashtonachamayou
authored
Cherry-pick #7216 pool replacement to 6.x LTS (excluding ci.yml) (#7227)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Eddy Ashton <edashton@microsoft.com> Co-authored-by: Amaury Chamayou <amchamay@microsoft.com> Co-authored-by: Amaury Chamayou <amaury@xargs.fr> Co-authored-by: achamayou <4016369+achamayou@users.noreply.github.com>
1 parent a3e3f96 commit 7d0cdd0

5 files changed

Lines changed: 17 additions & 17 deletions

File tree

.github/workflows/ci-verification.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions:
2222
jobs:
2323
model-checking-consistency:
2424
name: Model Checking - Consistency
25-
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
25+
runs-on: [self-hosted, 1ES.Pool=gha-vmss-d16av5-ci]
2626
container:
2727
image: mcr.microsoft.com/azurelinux/base/core:3.0
2828
options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
@@ -104,7 +104,7 @@ jobs:
104104
105105
model-checking-consensus:
106106
name: Model Checking - Consensus
107-
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
107+
runs-on: [self-hosted, 1ES.Pool=gha-vmss-d16av5-ci]
108108
container:
109109
image: mcr.microsoft.com/azurelinux/base/core:3.0
110110
options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
@@ -164,7 +164,7 @@ jobs:
164164
165165
trace-validation-consensus:
166166
name: Trace Validation - Consensus
167-
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
167+
runs-on: [self-hosted, 1ES.Pool=gha-vmss-d16av5-ci]
168168
container:
169169
image: mcr.microsoft.com/azurelinux/base/core:3.0
170170
options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
analyze:
2424
name: Analyze
2525
# Insufficient space to run on public runner, so use custom pool
26-
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
26+
runs-on: [self-hosted, 1ES.Pool=gha-vmss-d16av5-ci]
2727
container:
2828
image: mcr.microsoft.com/azurelinux/base/core:3.0
2929
options: --user root

.github/workflows/long-test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
long-asan:
1616
if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'}}
1717
name: "ASAN"
18-
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
18+
runs-on: [self-hosted, 1ES.Pool=gha-vmss-d16av5-ci]
1919
container:
2020
image: mcr.microsoft.com/azurelinux/base/core:3.0
2121
options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
@@ -69,10 +69,10 @@ jobs:
6969
long-tsan:
7070
if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'}}
7171
name: "TSAN"
72-
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
72+
runs-on: [self-hosted, 1ES.Pool=gha-vmss-d16av5-ci]
7373
container:
7474
image: mcr.microsoft.com/azurelinux/base/core:3.0
75-
options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
75+
options: --user root --publish-all --privileged
7676

7777
steps:
7878
- name: "Checkout dependencies"
@@ -106,7 +106,7 @@ jobs:
106106
run: |
107107
set +x
108108
cd build
109-
./tests.sh --output-on-failure --timeout 1600 -LE "benchmark"
109+
setarch -R ./tests.sh --output-on-failure --timeout 1600 -LE "benchmark"
110110
111111
- name: "Upload logs"
112112
if: success() || failure()
@@ -123,7 +123,7 @@ jobs:
123123
long-lts:
124124
if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'}}
125125
name: Long LTS
126-
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
126+
runs-on: [self-hosted, 1ES.Pool=gha-vmss-d16av5-ci]
127127
container:
128128
image: mcr.microsoft.com/azurelinux/base/core:3.0
129129
options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
@@ -179,7 +179,7 @@ jobs:
179179
long-e2e-debug:
180180
if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'}}
181181
name: Long e2e - Debug
182-
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
182+
runs-on: [self-hosted, 1ES.Pool=gha-vmss-d16av5-ci]
183183
container:
184184
image: mcr.microsoft.com/azurelinux/base/core:3.0
185185
options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
@@ -236,7 +236,7 @@ jobs:
236236
long-e2e-release:
237237
if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'}}
238238
name: Long e2e - Release
239-
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
239+
runs-on: [self-hosted, 1ES.Pool=gha-vmss-d16av5-ci]
240240
container:
241241
image: mcr.microsoft.com/azurelinux/base/core:3.0
242242
options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
@@ -290,7 +290,7 @@ jobs:
290290
e2e-suite-shuffled:
291291
if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'}}
292292
name: Long e2e - Shuffled
293-
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
293+
runs-on: [self-hosted, 1ES.Pool=gha-vmss-d16av5-ci]
294294
container:
295295
image: mcr.microsoft.com/azurelinux/base/core:3.0
296296
options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE

.github/workflows/long-verification.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
model-checking-with-atomic-reconfig-consensus:
2121
name: Model Checking With Atomic Reconfig - Consensus
2222
if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-verification') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
23-
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
23+
runs-on: [self-hosted, 1ES.Pool=gha-vmss-d16av5-ci]
2424
container:
2525
image: mcr.microsoft.com/azurelinux/base/core:3.0
2626
options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
@@ -53,7 +53,7 @@ jobs:
5353
model-checking-with-reconfig-consensus:
5454
name: Model Checking With Reconfig - Consensus
5555
if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-verification') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
56-
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
56+
runs-on: [self-hosted, 1ES.Pool=gha-vmss-d16av5-ci]
5757
container:
5858
image: mcr.microsoft.com/azurelinux/base/core:3.0
5959
options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
path: rel-notes.md
6666

6767
image_digest:
68-
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
68+
runs-on: [self-hosted, 1ES.Pool=gha-vmss-d16av5-ci]
6969
outputs:
7070
image_digest: ${{ steps.digest.outputs.digest }}
7171
steps:
@@ -89,7 +89,7 @@ jobs:
8989
- name: snp
9090
os: azure-linux
9191

92-
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
92+
runs-on: [self-hosted, 1ES.Pool=gha-vmss-d16av5-ci]
9393
container:
9494
image: ${{ needs.image_digest.outputs.image_digest }}
9595
options: "--user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE"
@@ -333,7 +333,7 @@ jobs:
333333
os: azure-linux
334334
- name: snp
335335
os: azure-linux
336-
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
336+
runs-on: [self-hosted, 1ES.Pool=gha-vmss-d16av5-ci]
337337
env:
338338
REPRO_DIR: /tmp/reproduced
339339
container:

0 commit comments

Comments
 (0)