Skip to content

Commit 694607d

Browse files
authored
test: merge separately http3 cases (#12223)
1 parent d63a1a2 commit 694607d

File tree

5 files changed

+20
-235
lines changed

5 files changed

+20
-235
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
test_dir:
3535
- t/plugin/[a-k]*
3636
- t/plugin/[l-z]*
37-
- t/admin t/cli t/config-center-yaml t/control t/core t/debug t/discovery t/error_page t/misc
37+
- t/admin t/cli t/config-center-yaml t/control t/core t/debug t/discovery t/error_page t/http3/admin t/misc
3838
- t/node t/pubsub t/router t/script t/secret t/stream-node t/utils t/wasm t/xds-library t/xrpc
3939

4040
runs-on: ${{ matrix.platform }}
@@ -89,6 +89,14 @@ jobs:
8989
run: |
9090
bash ./ci/free_disk_space.sh
9191
92+
- name: Linux Before install
93+
run: sudo ./ci/${{ matrix.os_name }}_runner.sh before_install
94+
95+
- name: Linux Install
96+
run: |
97+
sudo --preserve-env=OPENRESTY_VERSION \
98+
./ci/${{ matrix.os_name }}_runner.sh do_install
99+
92100
- name: Linux launch common services
93101
run: |
94102
make ci-env-up project_compose_ci=ci/pod/docker-compose.common.yml
@@ -174,14 +182,6 @@ jobs:
174182
sudo dpkg -i tinygo_${TINYGO_VER}_amd64.deb
175183
cd t/wasm && find . -type f -name "*.go" | xargs -Ip tinygo build -o p.wasm -scheduler=none -target=wasi p
176184
177-
- name: Linux Before install
178-
run: sudo ./ci/${{ matrix.os_name }}_runner.sh before_install
179-
180-
- name: Linux Install
181-
run: |
182-
sudo --preserve-env=OPENRESTY_VERSION \
183-
./ci/${{ matrix.os_name }}_runner.sh do_install
184-
185185
- name: Linux Script
186186
env:
187187
TEST_FILE_SUB_DIR: ${{ matrix.test_dir }}

.github/workflows/http3.yml

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

ci/common.sh

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,10 @@ rerun_flaky_tests() {
6767
}
6868

6969
install_curl () {
70-
CURL_VERSION="7.88.0"
71-
wget -q https://curl.se/download/curl-${CURL_VERSION}.tar.gz
72-
tar -xzf curl-${CURL_VERSION}.tar.gz
73-
cd curl-${CURL_VERSION}
74-
./configure --prefix=/usr/local --with-openssl --with-nghttp2
75-
make
76-
sudo make install
77-
sudo ldconfig
78-
cd ..
79-
rm -rf curl-${CURL_VERSION}
70+
CURL_VERSION="8.13.0"
71+
wget -q https://github.com/stunnel/static-curl/releases/download/${CURL_VERSION}/curl-linux-x86_64-glibc-${CURL_VERSION}.tar.xz
72+
tar -xf curl-linux-x86_64-glibc-${CURL_VERSION}.tar.xz
73+
sudo cp curl /usr/bin
8074
curl -V
8175
}
8276

@@ -171,9 +165,13 @@ GRPC_SERVER_EXAMPLE_VER=20210819
171165

172166
linux_get_dependencies () {
173167
apt update
174-
apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl libpcre3 libpcre3-dev
168+
apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl libpcre3 libpcre3-dev xz-utils
169+
apt remove -y curl
175170
apt-get install -y libyaml-dev
176171
wget https://github.com/mikefarah/yq/releases/download/3.4.1/yq_linux_amd64 -O /usr/bin/yq && sudo chmod +x /usr/bin/yq
172+
173+
# install curl with http3 support
174+
install_curl
177175
}
178176

179177
function start_grpc_server_example() {

ci/redhat-ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ install_dependencies() {
3131

3232
# install newer curl
3333
yum makecache
34-
yum install -y libnghttp2-devel
34+
yum install -y xz
3535
install_curl
3636

3737
# install apisix-runtime to make apisix's rpm test work

t/APISIX.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ _EOC_
743743
listen 1994 quic reuseport;
744744
listen 1994 ssl;
745745
http2 on;
746-
http3 off;
746+
http3 on;
747747
ssl_certificate cert/apisix.crt;
748748
ssl_certificate_key cert/apisix.key;
749749
lua_ssl_trusted_certificate $custom_trusted_cert;

0 commit comments

Comments
 (0)