Skip to content

Commit 59f1fa8

Browse files
sxddanishedbNiccoloFei
authored
chore: use bigger runners for the E2E tests (cloudnative-pg#10002)
Closes cloudnative-pg#10226 Signed-off-by: Jonathan Gonzalez V. <jonathan.gonzalez@enterprisedb.com> Signed-off-by: Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> Signed-off-by: danishedb <danish.khan@enterprisedb.com> Signed-off-by: Niccolò Fei <niccolo.fei@enterprisedb.com> Co-authored-by: danishedb <danish.khan@enterprisedb.com> Co-authored-by: Niccolò Fei <niccolo.fei@enterprisedb.com>
1 parent ade8f34 commit 59f1fa8

3 files changed

Lines changed: 18 additions & 6 deletions

File tree

.github/workflows/continuous-delivery.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ jobs:
238238
test_level: ${{ env.TEST_LEVEL }}
239239
feature_type: ${{ env.FEATURE_TYPE }}
240240
log_level: ${{ env.LOG_LEVEL }}
241+
runs_on: ${{ steps.set-runner.outputs.runs_on }}
241242
steps:
242243
- name: From command
243244
env:
@@ -272,6 +273,17 @@ jobs:
272273
echo "LOG_LEVEL=${IC_LOG_LEVEL}" >> $GITHUB_ENV
273274
fi
274275
276+
- name: Set runner based on organization
277+
env:
278+
REPO_OWNER: ${{ github.repository_owner }}
279+
id: set-runner
280+
run: |
281+
if [[ "${REPO_OWNER}" == "cloudnative-pg" ]]; then
282+
echo "runs_on=ubuntu-latest-16-cores" >> $GITHUB_OUTPUT
283+
else
284+
echo "runs_on=ubuntu-24.04" >> $GITHUB_OUTPUT
285+
fi
286+
275287
buildx:
276288
name: Build containers
277289
needs:
@@ -281,7 +293,7 @@ jobs:
281293
if: |
282294
always() && !cancelled() &&
283295
needs.evaluate_options.result == 'success'
284-
runs-on: ubuntu-24.04
296+
runs-on: ${{ needs.evaluate_options.outputs.runs_on }}
285297
permissions:
286298
contents: read
287299
packages: write
@@ -639,7 +651,7 @@ jobs:
639651
strategy:
640652
fail-fast: false
641653
matrix: ${{ fromJSON(needs.generate-jobs.outputs.kindMatrix) }}
642-
runs-on: ubuntu-24.04
654+
runs-on: ${{ needs.evaluate_options.outputs.runs_on }}
643655
env:
644656
# TEST_DEPTH determines the maximum test level the suite should be running
645657
TEST_DEPTH: ${{ needs.evaluate_options.outputs.test_level }}
@@ -834,7 +846,7 @@ jobs:
834846
strategy:
835847
fail-fast: false
836848
matrix: ${{ fromJSON(needs.generate-jobs.outputs.k3dMatrix) }}
837-
runs-on: ubuntu-24.04
849+
runs-on: ${{ needs.evaluate_options.outputs.runs_on }}
838850
env:
839851
# TEST_DEPTH determines the maximum test level the suite should be running
840852
TEST_DEPTH: ${{ needs.evaluate_options.outputs.test_level }}

.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ jobs:
430430
(needs.tests.result == 'success' || needs.tests.result == 'skipped') &&
431431
(needs.apidoc.result == 'success' || needs.apidoc.result == 'skipped') &&
432432
(needs.crd.result == 'success' || needs.crd.result == 'skipped')
433-
runs-on: ubuntu-24.04
433+
runs-on: ${{ github.repository_owner == 'cloudnative-pg' && 'ubuntu-latest-16-cores' || 'ubuntu-24.04' }}
434434
permissions:
435435
actions: read
436436
contents: read
@@ -873,7 +873,7 @@ jobs:
873873
matrix:
874874
test: [ kiwi, lemon, orange ]
875875
name: Run OLM ${{ matrix.test }} test
876-
runs-on: ubuntu-24.04
876+
runs-on: ${{ github.repository_owner == 'cloudnative-pg' && 'ubuntu-latest-16-cores' || 'ubuntu-24.04' }}
877877
needs:
878878
- buildx
879879
- olm-bundle

.github/workflows/release-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112

113113
release-binaries:
114114
name: Build containers
115-
runs-on: ubuntu-24.04
115+
runs-on: ${{ github.repository_owner == 'cloudnative-pg' && 'ubuntu-latest-16-cores' || 'ubuntu-24.04' }}
116116
permissions:
117117
packages: write
118118
contents: write

0 commit comments

Comments
 (0)