Skip to content

Commit 9ee75cf

Browse files
authored
chore: release-e2e-ginkgo-image (#654)
1 parent 8fb7c05 commit 9ee75cf

File tree

4 files changed

+353
-15
lines changed

4 files changed

+353
-15
lines changed

.github/workflows/cloud-e2e-schedule-dev.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,32 @@ jobs:
1919
CONTEXT: "./e2e"
2020
DOCKERFILE_PATH: "./e2e/Dockerfile"
2121
VERSION: "${{ matrix.branch-name }}"
22-
GO_VERSION: "1.23.1"
22+
GO_VERSION: "1.24.9"
2323
REMOVE_PREFIX: false
2424
BUILDX_ARGS: |
2525
ALPINE_IMAGE=apecloud/alpine:3.16
2626
secrets: inherit
2727

28+
release-e2e-ginkgo-image:
29+
strategy:
30+
fail-fast: false
31+
matrix:
32+
branch-name: [ "main" ]
33+
uses: ./.github/workflows/release-image-sync2.yml
34+
with:
35+
GITHUB_REPO: "apecloud/apecloud"
36+
GITHUB_REF: "${{ matrix.branch-name }}"
37+
MAKE_OPS: "build"
38+
VERSION: "${{ matrix.branch-name }}"
39+
GO_VERSION: "1.24.9"
40+
BUILDX_ENABLED: true
41+
GIT_CONFIG: true
42+
REMOVE_PREFIX: false
43+
MAKE_ARGS: "TARGETS=docker/e2e-ginkgo "
44+
secrets: inherit
45+
2846
e2e-api-test:
29-
needs: [ release-e2e-image ]
47+
needs: [ release-e2e-image, release-e2e-ginkgo-image ]
3048
uses: ./.github/workflows/trigger-workflow.yml
3149
with:
3250
GITHUB_REPO: "apecloud/apecloud-cd"

.github/workflows/cloud-e2e-schedule-idc.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,24 @@ jobs:
3131
ALPINE_IMAGE=apecloud/alpine:3.16
3232
secrets: inherit
3333

34+
release-e2e-ginkgo-image:
35+
strategy:
36+
fail-fast: false
37+
matrix:
38+
branch-name: [ "release-1.1", "release-2.0" ]
39+
uses: ./.github/workflows/release-image-sync2.yml
40+
with:
41+
GITHUB_REPO: "apecloud/apecloud"
42+
GITHUB_REF: "${{ matrix.branch-name }}"
43+
MAKE_OPS: "build"
44+
VERSION: "${{ matrix.branch-name }}"
45+
GO_VERSION: "1.24.9"
46+
BUILDX_ENABLED: true
47+
GIT_CONFIG: true
48+
REMOVE_PREFIX: false
49+
MAKE_ARGS: "TARGETS=docker/e2e-ginkgo "
50+
secrets: inherit
51+
3452
schedule-cron:
3553
runs-on: ubuntu-latest
3654
outputs:
@@ -52,7 +70,7 @@ jobs:
5270
echo day-of-week="${DAY_OF_WEEK}" >> $GITHUB_OUTPUT
5371
5472
e2e-engine-test-10:
55-
needs: [ release-e2e-image, schedule-cron ]
73+
needs: [ release-e2e-image, release-e2e-ginkgo-image, schedule-cron ]
5674
uses: ./.github/workflows/trigger-workflow.yml
5775
with:
5876
GITHUB_REPO: "apecloud/apecloud-cd"
@@ -63,7 +81,7 @@ jobs:
6381
secrets: inherit
6482

6583
e2e-engine-test-20-10:
66-
needs: [ release-e2e-image, schedule-cron ]
84+
needs: [ release-e2e-image, release-e2e-ginkgo-image, schedule-cron ]
6785
uses: ./.github/workflows/trigger-workflow.yml
6886
with:
6987
GITHUB_REPO: "apecloud/apecloud-cd"
@@ -74,7 +92,7 @@ jobs:
7492
secrets: inherit
7593

7694
e2e-engine-test-20-09:
77-
needs: [ release-e2e-image, schedule-cron ]
95+
needs: [ release-e2e-image, release-e2e-ginkgo-image, schedule-cron ]
7896
uses: ./.github/workflows/trigger-workflow.yml
7997
with:
8098
GITHUB_REPO: "apecloud/apecloud-cd"

.github/workflows/release-image-sync.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,6 @@ on:
5353
type: string
5454
required: false
5555
default: ''
56-
GOOGLE_IMG:
57-
description: "The URL to use building/pushing gcr image targets (e.g. apecloud-prod/controller-manager/apecloud)"
58-
type: string
59-
required: false
60-
default: ''
61-
GOOGLE_REGISTRY_URL:
62-
description: "The GOOGLE REGISTRY URL to use building/pushing image targets (e.g. us-east1-docker.pkg.dev)"
63-
type: string
64-
required: false
65-
default: ''
6656
GIT_CONFIG:
6757
description: "InsteadOf git config global url (default: false)"
6858
type: boolean

0 commit comments

Comments
 (0)