Skip to content

Commit 575f217

Browse files
authored
fix: repairing failed CI (apache#12805)
1 parent 896d3c3 commit 575f217

15 files changed

+44
-20
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ jobs:
8181
run: |
8282
bash ./ci/free_disk_space.sh
8383
84+
- name: Set hostname
85+
run: |
86+
sudo sh -c 'echo "127.0.1.1 httpbin.local" >> /etc/hosts'
87+
8488
- name: Linux Before install
8589
run: sudo ./ci/${{ matrix.os_name }}_runner.sh before_install
8690

.github/workflows/push-dev-image-on-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
"uri": "/get",
6969
"upstream": {
7070
"type": "roundrobin",
71-
"nodes": { "httpbin.org:80": 1 }
71+
"nodes": { "httpbin:8080": 1 }
7272
}
7373
}'
7474

ci/pod/docker-compose.common.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,12 @@ services:
111111
restart: unless-stopped
112112
ports:
113113
- "127.0.0.1:4566:4566" # LocalStack Gateway
114+
115+
116+
## httpbin - HTTP Request & Response Service
117+
httpbin:
118+
image: kennethreitz/httpbin
119+
container_name: httpbin
120+
restart: unless-stopped
121+
ports:
122+
- "8280:80"

docker/compose/docker-compose-master.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@ services:
4747
networks:
4848
- apisix
4949

50+
httpbin:
51+
image: ghcr.io/mccutchen/go-httpbin
52+
restart: always
53+
ports:
54+
- "8280:8080/tcp"
55+
networks:
56+
- apisix
57+
5058
networks:
5159
apisix:
5260
driver: bridge

t/admin/consumer-credentials.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ nginx_config:
4646
"upstream": {
4747
"type": "roundrobin",
4848
"nodes": {
49-
"httpbin.org:80": 1
49+
"httpbin.local:8280": 1
5050
}
5151
},
5252
"plugins": {

t/admin/routes_request_body.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ __DATA__
5050
"upstream": {
5151
"type": "roundrobin",
5252
"nodes": {
53-
"httpbin.org:80": 1
53+
"httpbin.local:8280": 1
5454
}
5555
}
5656
}]]

t/control/control-healthcheck-bug-fix.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ __DATA__
3737
"methods": ["GET"],
3838
"upstream": {
3939
"nodes": {
40-
"httpbin.org:80": 1,
40+
"httpbin.local:8280": 1,
4141
"mockbin.org:80": 1
4242
},
4343
"type": "roundrobin"

t/plugin/ai-proxy-multi2.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ passed
263263
"upstream": {
264264
"type": "roundrobin",
265265
"nodes": {
266-
"httpbin.org": 1
266+
"httpbin.local:8280": 1
267267
}
268268
}
269269
}]]

t/plugin/ai-proxy2.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ passed
237237
"upstream": {
238238
"type": "roundrobin",
239239
"nodes": {
240-
"httpbin.org": 1
240+
"httpbin.local:8280": 1
241241
}
242242
}
243243
}]]

t/plugin/ai-request-rewrite.t

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ passed
322322
"upstream": {
323323
"type": "roundrobin",
324324
"nodes": {
325-
"httpbin.org:80": 1
325+
"httpbin.local:8280": 1
326326
}
327327
}
328328
}]]
@@ -384,7 +384,7 @@ passed
384384
"upstream": {
385385
"type": "roundrobin",
386386
"nodes": {
387-
"httpbin.org:80": 1
387+
"httpbin.local:8280": 1
388388
}
389389
}
390390
}]]
@@ -554,7 +554,7 @@ passed
554554
"upstream": {
555555
"type": "roundrobin",
556556
"nodes": {
557-
"httpbin.org:80": 1
557+
"httpbin.local:8280": 1
558558
}
559559
}
560560
}]]
@@ -620,7 +620,7 @@ passed
620620
"upstream": {
621621
"type": "roundrobin",
622622
"nodes": {
623-
"httpbin.org:80": 1
623+
"httpbin.local:8280": 1
624624
}
625625
}
626626
}]]
@@ -684,7 +684,7 @@ passed
684684
"upstream": {
685685
"type": "roundrobin",
686686
"nodes": {
687-
"httpbin.org:80": 1
687+
"httpbin.local:8280": 1
688688
}
689689
}
690690
}]]

0 commit comments

Comments
 (0)