Skip to content

Commit 7b7aa4c

Browse files
ronethingronething
committed
chore(ci): change trigger branch
Signed-off-by: ashing <[email protected]>
1 parent fa25717 commit 7b7aa4c

File tree

7 files changed

+225
-233
lines changed

7 files changed

+225
-233
lines changed

‎.github/workflows/apisix-conformance-test.yml‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
name: APISIX Conformance Test
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- next
8+
pull_request:
9+
branches:
10+
- master
11+
- next
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
15+
cancel-in-progress: true
16+
17+
jobs:
18+
prepare:
19+
name: Prepare
20+
runs-on: buildjet-2vcpu-ubuntu-2204
21+
steps:
22+
- name: Checkout
23+
uses: actions/checkout@v4
24+
25+
- name: Setup Go Env
26+
id: go
27+
uses: actions/setup-go@v4
28+
with:
29+
go-version: "1.22"
30+
31+
- name: Install kind
32+
run: |
33+
go install sigs.k8s.io/[email protected]
34+
35+
conformance-test:
36+
timeout-minutes: 60
37+
needs:
38+
- prepare
39+
runs-on: buildjet-2vcpu-ubuntu-2204
40+
steps:
41+
- name: Checkout
42+
uses: actions/checkout@v4
43+
with:
44+
submodules: recursive
45+
46+
- name: Setup Go Env
47+
uses: actions/setup-go@v4
48+
with:
49+
go-version: "1.22"
50+
51+
- name: Build images
52+
env:
53+
TAG: dev
54+
ARCH: amd64
55+
ENABLE_PROXY: "false"
56+
BASE_IMAGE_TAG: "debug"
57+
ADC_VERSION: "dev"
58+
run: |
59+
echo "building images..."
60+
make build-image
61+
62+
- name: Launch Kind Cluster
63+
run: |
64+
make kind-up
65+
66+
- name: Install And Run Cloud Provider KIND
67+
run: |
68+
go install sigs.k8s.io/cloud-provider-kind@latest
69+
nohup cloud-provider-kind > /tmp/kind-loadbalancer.log 2>&1 &
70+
71+
- name: Install Gateway API And CRDs
72+
run: |
73+
make install
74+
75+
- name: Loading Docker Image to Kind Cluster
76+
run: |
77+
make kind-load-ingress-image
78+
79+
- name: Run Conformance Test
80+
shell: bash
81+
continue-on-error: true
82+
run: |
83+
make conformance-test-standalone
84+
85+
- name: Get Logs from apisix-ingress-controller
86+
shell: bash
87+
run: |
88+
export KUBECONFIG=/tmp/apisix-ingress-cluster.kubeconfig
89+
kubectl logs -n apisix-conformance-test -l app=apisix-ingress-controller
90+
91+
- name: Upload Gateway API Conformance Report
92+
if: ${{ github.event_name == 'push' }}
93+
uses: actions/upload-artifact@v4
94+
with:
95+
name: apisix-ingress-controller-conformance-report.yaml
96+
path: apisix-ingress-controller-conformance-report.yaml
97+
98+
- name: Format Conformance Test Report
99+
if: ${{ github.event_name == 'pull_request' }}
100+
run: |
101+
echo '# conformance test report' > report.md
102+
echo '```yaml' >> report.md
103+
cat apisix-ingress-controller-conformance-report.yaml >> report.md
104+
echo '```' >> report.md
105+
106+
- name: Report Conformance Test Result to PR Comment
107+
if: ${{ github.event_name == 'pull_request' }}
108+
uses: mshick/add-pr-comment@v2
109+
with:
110+
message-id: 'apisix-conformance-test-report'
111+
message-path: |
112+
report.md

‎.github/workflows/apisix-e2e-test.yml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
name: APISIX E2E Test
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- next
8+
pull_request:
9+
branches:
10+
- master
11+
- next
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
15+
cancel-in-progress: true
16+
17+
jobs:
18+
prepare:
19+
name: Prepare
20+
runs-on: buildjet-2vcpu-ubuntu-2204
21+
steps:
22+
- name: Checkout
23+
uses: actions/checkout@v4
24+
25+
- name: Setup Go Env
26+
id: go
27+
uses: actions/setup-go@v4
28+
with:
29+
go-version: "1.22"
30+
31+
- name: Install kind
32+
run: |
33+
go install sigs.k8s.io/[email protected]
34+
35+
e2e-test:
36+
needs:
37+
- prepare
38+
runs-on: buildjet-2vcpu-ubuntu-2204
39+
steps:
40+
- name: Checkout
41+
uses: actions/checkout@v4
42+
with:
43+
submodules: recursive
44+
45+
- name: Setup Go Env
46+
uses: actions/setup-go@v4
47+
with:
48+
go-version: "1.22"
49+
50+
- name: Build images
51+
env:
52+
TAG: dev
53+
ARCH: amd64
54+
ENABLE_PROXY: "false"
55+
BASE_IMAGE_TAG: "debug"
56+
ADC_VERSION: "dev"
57+
run: |
58+
echo "building images..."
59+
make build-image
60+
61+
- name: Extract adc binary
62+
run: |
63+
echo "Extracting adc binary..."
64+
docker create --name adc-temp apache/apisix-ingress-controller:dev
65+
docker cp adc-temp:/bin/adc /usr/local/bin/adc
66+
docker rm adc-temp
67+
chmod +x /usr/local/bin/adc
68+
echo "ADC binary extracted to /usr/local/bin/adc"
69+
70+
- name: Launch Kind Cluster
71+
run: |
72+
make kind-up
73+
74+
- name: Loading Docker Image to Kind Cluster
75+
run: |
76+
make kind-load-ingress-image
77+
78+
- name: Install Gateway API And CRDs
79+
run: |
80+
make install
81+
82+
- name: Run E2E test suite
83+
shell: bash
84+
env:
85+
TEST_DIR: "./test/e2e/apisix/"
86+
run: |
87+
make e2e-test

‎.github/workflows/lint-checker.yml‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎.github/workflows/push-docker.yaml‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,40 @@
11
name: push on dockerhub
22
on:
3-
release:
4-
types: [published]
3+
push:
4+
tags:
5+
- '*'
56

67
jobs:
78
docker:
8-
runs-on: ubuntu-20.04
9+
runs-on: buildjet-2vcpu-ubuntu-2204
910
steps:
10-
-
11-
name: Checkout
12-
uses: actions/checkout@v3
11+
- name: Checkout
12+
uses: actions/checkout@v4
1313
with:
14-
ref: ${{ github.ref }} # Use the reference to the release
15-
-
16-
name: Set up QEMU
14+
ref: ${{ github.ref }}
15+
submodules: recursive
16+
- name: Setup Go Env
17+
uses: actions/setup-go@v4
18+
with:
19+
go-version: "1.22"
20+
21+
- name: Set up QEMU
1722
uses: docker/setup-qemu-action@v3
18-
-
19-
name: Set up Docker Buildx
23+
24+
- name: Set up Docker Buildx
2025
uses: docker/setup-buildx-action@v3
21-
-
22-
name: Login to Docker Hub
26+
27+
- name: Login to Registry
2328
uses: docker/login-action@v3
2429
with:
2530
registry: ${{ secrets.DOCKER_REGISTRY }}
2631
username: ${{ secrets.DOCKER_USERNAME }}
2732
password: ${{ secrets.DOCKER_PASSWORD }}
2833
-
29-
name: Build and push
30-
uses: docker/build-push-action@v5
31-
with:
32-
context: .
33-
platforms: linux/amd64,linux/arm64
34-
push: true
35-
tags: '${{ github.event.release.tag_name }}' # Use the release tag as the image tag
34+
name: Build and push multi-arch image
35+
env:
36+
TAG: ${{ github.ref_name }}
37+
IMAGE_TAG: ${{ github.ref_name }}
38+
run: |
39+
echo "building multi-arch images with tag: $TAG"
40+
make build-push-multi-arch-image

‎config/samples/config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ exec_adc_timeout: 15s # The timeout for the ADC to execute.
3232
# The default value is 15 seconds.
3333

3434
provider:
35-
type: "api7ee"
35+
type: "apisix-standalone"
3636

3737
sync_period: 0s
3838
# The period between two consecutive syncs.

0 commit comments

Comments
 (0)