chore: drop support of OpenResty 1.19 (#9913)

apache · Jul 28, 2023 · 0a4cbc0 · 0a4cbc0
1 parent ccb3568
commit 0a4cbc0
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 36 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,6 @@ jobs:
           - ubuntu-20.04
         os_name:
           - linux_openresty
-          - linux_openresty_1_19
         test_dir:
           - t/plugin/[a-k]*
           - t/plugin/[l-z]*

diff --git a/.github/workflows/kubernetes-ci.yml b/.github/workflows/kubernetes-ci.yml
@@ -28,7 +28,6 @@ jobs:
           - ubuntu-20.04
         os_name:
           - linux_openresty
-          - linux_openresty_1_19
 
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 15

diff --git a/.github/workflows/tars-ci.yml b/.github/workflows/tars-ci.yml
@@ -28,7 +28,6 @@ jobs:
           - ubuntu-20.04
         os_name:
           - linux_openresty
-          - linux_openresty_1_19
 
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 15

diff --git a/apisix/cli/ops.lua b/apisix/cli/ops.lua
@@ -258,7 +258,7 @@ Please modify "admin_key" in conf/config.yaml .
         util.die("can not find openresty\n")
     end
 
-    local need_ver = "1.19.3"
+    local need_ver = "1.21.4"
     if not version_greater_equal(or_ver, need_ver) then
         util.die("openresty version must >=", need_ver, " current ", or_ver, "\n")
     end

diff --git a/ci/linux_openresty_1_19_runner.sh b/ci/linux_openresty_1_19_runner.sh
diff --git a/t/chaos/utils/Dockerfile b/t/chaos/utils/Dockerfile
@@ -17,7 +17,7 @@
 
 ARG ENABLE_PROXY=false
 
-FROM openresty/openresty:1.19.3.2-alpine-fat AS production-stage
+FROM openresty/openresty:1.21.4.1-alpine-fat AS production-stage
 
 ARG ENABLE_PROXY
 ARG APISIX_PATH

diff --git a/t/kubernetes/discovery/stream/kubernetes.t b/t/kubernetes/discovery/stream/kubernetes.t
@@ -51,11 +51,7 @@ use t::APISIX;
 my $nginx_binary = $ENV{'TEST_NGINX_BINARY'} || 'nginx';
 my $version = eval { `$nginx_binary -V 2>&1` };
 
-if ($version =~ m/\/1.19.3/) {
-    plan(skip_all => "require OpenResty version >= 1.19.9.1");
-} else {
-    plan('no_plan');
-}
+plan('no_plan');
 
 repeat_each(1);
 log_level('warn');

diff --git a/t/tars/discovery/stream/tars.t b/t/tars/discovery/stream/tars.t
@@ -19,11 +19,7 @@ use t::APISIX;
 my $nginx_binary = $ENV{'TEST_NGINX_BINARY'} || 'nginx';
 my $version = eval { `$nginx_binary -V 2>&1` };
 
-if ($version =~ m/\/1.19.3/) {
-    plan(skip_all => "require OpenResty version >= 1.19.9.1");
-} else {
-    plan('no_plan');
-}
+plan('no_plan');
 
 repeat_each(1);
 log_level('warn');