Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: support openresty 1.21.4.2 #10004

Merged
merged 9 commits into from
Aug 29, 2023
Merged

feat: support openresty 1.21.4.2 #10004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0c79c25
CI(test): support openresty 1.21.4.2
AlinsRan Aug 11, 2023
ac74ca6
Update linux-install-openresty.sh
AlinsRan Aug 11, 2023
cad60e2
Update linux-install-openresty.sh
AlinsRan Aug 14, 2023
0b3da67
fix websocket client
AlinsRan Aug 14, 2023
45cdb7c
all replace openresty 1.21.4.2
AlinsRan Aug 14, 2023
30781b5
fix test cases
AlinsRan Aug 14, 2023
cfb5e97
fix test cases
AlinsRan Aug 15, 2023
456738f
Merge branch 'apache:master' into ci/or-1.21.4.2
AlinsRan Aug 29, 2023
0f1bcca
Update linux-install-openresty.sh
AlinsRan Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/centos7-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ install_dependencies() {

# install openresty to make apisix's rpm test work
yum install -y yum-utils && yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo
yum install -y openresty-1.21.4.1 openresty-debug-1.21.4.1 openresty-openssl111-debug-devel pcre pcre-devel
yum install -y openresty-1.21.4.2 openresty-debug-1.21.4.2 openresty-openssl111-debug-devel pcre pcre-devel

# install luarocks
./utils/linux-install-luarocks.sh
Expand Down
2 changes: 1 addition & 1 deletion ci/redhat-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ install_dependencies() {

# install openresty to make apisix's rpm test work
yum install -y yum-utils && yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo
yum install -y openresty-1.21.4.1 openresty-debug-1.21.4.1 openresty-openssl111-debug-devel pcre pcre-devel xz
yum install -y openresty-1.21.4.2 openresty-debug-1.21.4.2 openresty-openssl111-debug-devel pcre pcre-devel xz

# install luarocks
./utils/linux-install-luarocks.sh
Expand Down
2 changes: 1 addition & 1 deletion t/chaos/utils/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

ARG ENABLE_PROXY=false

FROM openresty/openresty:1.21.4.1-alpine-fat AS production-stage
FROM openresty/openresty:1.21.4.2-alpine-fat AS production-stage

ARG ENABLE_PROXY
ARG APISIX_PATH
Expand Down
10 changes: 5 additions & 5 deletions t/core/etcd.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,8 +396,8 @@ ab
--- request
GET /t
--- grep_error_log eval
qr/init_by_lua:\d+: \S+/
--- grep_error_log_out
init_by_lua:12: ab
init_by_lua:19: 200
init_by_lua:26: 404
qr/init_by_lua.*: \S+/
--- grep_error_log_out eval
qr{init_by_lua.* ab
init_by_lua.* 200
init_by_lua.* 404}
5 changes: 4 additions & 1 deletion t/node/upstream-websocket.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,10 @@ passed
local client = require "resty.websocket.client"
local wb = client:new()
local uri = "wss://127.0.0.1:1994/websocket_handshake"
local ok, err = wb:connect(uri)
local opts = {
server_name = "127.0.0.1"
}
local ok, err = wb:connect(uri, opts)
if not ok then
ngx.say("failed to connect: " .. err)
return
Expand Down
11 changes: 10 additions & 1 deletion t/plugin/ext-plugin/sanity.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
use t::APISIX 'no_plan';
use t::APISIX;

my $nginx_binary = $ENV{'TEST_NGINX_BINARY'} || 'nginx';
my $version = eval { `$nginx_binary -V 2>&1` };

if ($version !~ m/\/apisix-nginx-module/) {
plan(skip_all => "apisix-nginx-module not installed");
} else {
plan('no_plan');
}

repeat_each(1);
no_long_string();
Expand Down
11 changes: 10 additions & 1 deletion t/plugin/ext-plugin/sanity2.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
use t::APISIX 'no_plan';
use t::APISIX;

my $nginx_binary = $ENV{'TEST_NGINX_BINARY'} || 'nginx';
my $version = eval { `$nginx_binary -V 2>&1` };

if ($version !~ m/\/apisix-nginx-module/) {
plan(skip_all => "apisix-nginx-module not installed");
} else {
plan('no_plan');
}

repeat_each(1);
no_long_string();
Expand Down
Loading