[apisix] branch master updated: ci: add missing OPENRESTY_PREFIX env variable (#3464)

[tokers]

This is an automated email from the ASF dual-hosted git repository.

tokers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new 3f0c3ae  ci: add missing OPENRESTY_PREFIX env variable (#3464)
3f0c3ae is described below

commit 3f0c3ae5e41d22c9e9d40269a9221223a0bf48ed
Author: 罗泽轩 <spacewander...@gmail.com>
AuthorDate: Mon Feb 1 13:15:53 2021 +0800

    ci: add missing OPENRESTY_PREFIX env variable (#3464)
    
    Signed-off-by: spacewander <spacewander...@gmail.com>
---
 .travis/linux_apisix_current_luarocks_runner.sh |  4 +++-
 .travis/linux_apisix_master_luarocks_runner.sh  |  2 ++
 utils/centos7-ci.sh                             | 11 +++++------
 utils/linux-install-luarocks.sh                 |  8 ++++----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.travis/linux_apisix_current_luarocks_runner.sh 
b/.travis/linux_apisix_current_luarocks_runner.sh
index 2f8796f..1f83c4e 100755
--- a/.travis/linux_apisix_current_luarocks_runner.sh
+++ b/.travis/linux_apisix_current_luarocks_runner.sh
@@ -19,8 +19,10 @@
 . ./.travis/common.sh
 
 do_install() {
+    export_or_prefix
+
     ./utils/linux-install-openresty.sh
-    OR_PREFIX=/usr/local/openresty-debug ./utils/linux-install-luarocks.sh
+    ./utils/linux-install-luarocks.sh
     ./utils/linux-install-etcd-client.sh
 }
 
diff --git a/.travis/linux_apisix_master_luarocks_runner.sh 
b/.travis/linux_apisix_master_luarocks_runner.sh
index 205bfe9..52946a0 100755
--- a/.travis/linux_apisix_master_luarocks_runner.sh
+++ b/.travis/linux_apisix_master_luarocks_runner.sh
@@ -19,6 +19,8 @@
 . ./.travis/common.sh
 
 do_install() {
+    export_or_prefix
+
     ./utils/linux-install-openresty.sh
     ./utils/linux-install-luarocks.sh
     ./utils/linux-install-etcd-client.sh
diff --git a/utils/centos7-ci.sh b/utils/centos7-ci.sh
index 3f4c5f5..9e8d817 100755
--- a/utils/centos7-ci.sh
+++ b/utils/centos7-ci.sh
@@ -16,12 +16,10 @@
 # limitations under the License.
 #
 
-#!/bin/bash
-
-set -ex
+. ./apisix/.travis/common.sh
 
 install_dependencies() {
-    export 
PATH=/usr/local/openresty-debug/nginx/sbin:/usr/local/openresty-debug/bin:$PATH
+    export_or_prefix
 
     # install development tools
     yum install -y wget tar gcc automake autoconf libtool make unzip \
@@ -32,7 +30,7 @@ install_dependencies() {
     rpm -ivh epel-release-latest-7.noarch.rpm
     yum install -y lua-devel
 
-    OR_PREFIX=/usr/local/openresty-debug 
./apisix/utils/linux-install-luarocks.sh
+    ./apisix/utils/linux-install-luarocks.sh
 
     # install openresty
     yum install -y yum-utils && yum-config-manager --add-repo 
https://openresty.org/package/centos/openresty.repo
@@ -70,7 +68,8 @@ install_dependencies() {
 }
 
 run_case() {
-    export 
PATH=/usr/local/openresty-debug/nginx/sbin:/usr/local/openresty-debug/bin:$PATH
+    export_or_prefix
+
     cd apisix
 
     # run test cases
diff --git a/utils/linux-install-luarocks.sh b/utils/linux-install-luarocks.sh
index 43c97e2..addcc6c 100755
--- a/utils/linux-install-luarocks.sh
+++ b/utils/linux-install-luarocks.sh
@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-if [ -z ${OR_PREFIX} ]; then
-    OR_PREFIX="/usr/local/openresty"
+if [ -z ${OPENRESTY_PREFIX} ]; then
+    OPENRESTY_PREFIX="/usr/local/openresty"
 fi
 
 wget https://github.com/luarocks/luarocks/archive/v3.4.0.tar.gz
@@ -30,5 +30,5 @@ cd .. || exit
 rm -rf luarocks-3.4.0
 
 mkdir ~/.luarocks || true
-luarocks config variables.OPENSSL_LIBDIR ${OR_PREFIX}/openssl/lib
-luarocks config variables.OPENSSL_INCDIR ${OR_PREFIX}/openssl/include
+luarocks config variables.OPENSSL_LIBDIR ${OPENRESTY_PREFIX}/openssl/lib
+luarocks config variables.OPENSSL_INCDIR ${OPENRESTY_PREFIX}/openssl/include