Skip to content

Commit cf03fd0

Browse files
committed
update ci
1 parent 1e0a7d2 commit cf03fd0

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,15 @@ jobs:
5858
echo "building images..."
5959
make build-image
6060
61+
- name: Extract adc binary
62+
run: |
63+
echo "Extracting adc binary..."
64+
docker run --name adc-temp --entrypoint="" api7/api7-ingress-controller:dev /bin/true
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+
6170
- name: Launch Kind Cluster
6271
run: |
6372
make kind-up

.github/workflows/e2e-test.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,13 @@ jobs:
7070
echo "building images..."
7171
make build-image
7272
73-
- name: Build Dockerfile.dev and extract adc binary
73+
- name: Extract adc binary
7474
run: |
75-
echo "Building Dockerfile.dev..."
76-
docker build -f Dockerfile.dev -t adc-builder:latest .
7775
echo "Extracting adc binary..."
78-
docker run --name adc-temp --entrypoint="" adc-builder:latest /bin/true
79-
docker cp adc-temp:/bin/adc ./bin/adc
76+
docker run --name adc-temp --entrypoint="" api7/api7-ingress-controller:dev /bin/true
77+
docker cp adc-temp:/bin/adc /usr/local/bin/adc
8078
docker rm adc-temp
81-
chmod +x ./bin/adc
82-
mv ./bin/adc /usr/local/bin/adc
79+
chmod +x /usr/local/bin/adc
8380
echo "ADC binary extracted to /usr/local/bin/adc"
8481
8582
- name: Launch Kind Cluster

test/e2e/crds/backendtrafficpolicy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ spec:
259259
`
260260

261261
BeforeEach(beforeEach)
262-
FIt("should rewrite upstream host", func() {
262+
It("should rewrite upstream host", func() {
263263
s.ResourceApplied("BackendTrafficPolicy", "httpbin", createUpstreamHost, 1)
264264
s.NewAPISIXClient().
265265
GET("/headers").

test/e2e/crds/consumer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
2424
)
2525

26-
var _ = Describe("Test Consumer", func() {
26+
var _ = PDescribe("Test Consumer", func() {
2727
s := scaffold.NewDefaultScaffold()
2828

2929
var defaultGatewayProxy = `

test/e2e/scaffold/k8s.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func (s *Scaffold) ResourceApplied(resourType, resourceName, resourceRaw string,
191191
),
192192
fmt.Sprintf("checking %s condition status", resourType),
193193
)
194-
time.Sleep(1 * time.Second)
194+
time.Sleep(3 * time.Second)
195195
}
196196

197197
func (s *Scaffold) ApplyDefaultGatewayResource(

0 commit comments

Comments
 (0)