[incubator-apisix] branch master updated: travis: supports installing APISIX using the current branch and running (#1212)

[li...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new b835bb7  travis: supports installing APISIX using the current branch and running (#1212)
b835bb7 is described below

commit b835bb79f1bffe0c7db734c492eabea793e1d5da
Author: YuanSheng Wang <me...@gmail.com>
AuthorDate: Sat Mar 7 14:59:18 2020 +0800

    travis: supports installing APISIX using the current branch and running (#1212)
    
    * travis: supports installing APISIX using the current branch and running
        test cases separately in CI.
    
    * bugfix: install apisix from local folder.
    
    * travis: install `master` version apisix by luarocks and run e2e test.
---
 .travis.yml                                             |  6 ++++--
 ...unner.sh => linux_apisix_current_luarocks_runner.sh} | 17 +++++------------
 ...runner.sh => linux_apisix_master_luarocks_runner.sh} |  3 +++
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 58ce94f..60fa1d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ matrix:
   fast_finish: true
   allow_failures:
     - os: osx
-    - env: OSNAME=linux_apisix_luarocks
+    - env: OSNAME=linux_apisix_master_luarocks
 
   include:
     - os: linux
@@ -24,7 +24,9 @@ matrix:
         - docker
       env: OSNAME=linux_tengine
     - os: linux
-      env: OSNAME=linux_apisix_luarocks
+      env: OSNAME=linux_apisix_master_luarocks
+    - os: linux
+      env: OSNAME=linux_apisix_current_luarocks
 
 language: c
 
diff --git a/.travis/linux_apisix_luarocks_runner.sh b/.travis/linux_apisix_current_luarocks_runner.sh
similarity index 82%
copy from .travis/linux_apisix_luarocks_runner.sh
copy to .travis/linux_apisix_current_luarocks_runner.sh
index d3e2e23..12fcb15 100755
--- a/.travis/linux_apisix_luarocks_runner.sh
+++ b/.travis/linux_apisix_current_luarocks_runner.sh
@@ -39,19 +39,12 @@ script() {
     openresty -V
     sudo service etcd start
 
-    # install APISIX by shell
-    sudo mkdir -p /usr/local/apisix/deps
-    sudo PATH=$PATH ./utils/install-apisix.sh install
+    # install APISIX with local version
+    sudo luarocks install rockspec/apisix-master-0.rockspec --only-deps
+    sudo luarocks make rockspec/apisix-master-0.rockspec
 
-    sudo PATH=$PATH apisix help
-    sudo PATH=$PATH apisix init
-    sudo PATH=$PATH apisix start
-    sudo PATH=$PATH apisix stop
-
-    sudo PATH=$PATH ./utils/install-apisix.sh remove
-
-    # install APISIX by luarocks
-    sudo luarocks install rockspec/apisix-master-0.rockspec
+    # show install file
+    luarocks show apisix
 
     sudo PATH=$PATH apisix help
     sudo PATH=$PATH apisix init
diff --git a/.travis/linux_apisix_luarocks_runner.sh b/.travis/linux_apisix_master_luarocks_runner.sh
similarity index 97%
rename from .travis/linux_apisix_luarocks_runner.sh
rename to .travis/linux_apisix_master_luarocks_runner.sh
index d3e2e23..e1fe268 100755
--- a/.travis/linux_apisix_luarocks_runner.sh
+++ b/.travis/linux_apisix_master_luarocks_runner.sh
@@ -53,6 +53,9 @@ script() {
     # install APISIX by luarocks
     sudo luarocks install rockspec/apisix-master-0.rockspec
 
+    # show install files
+    luarocks show apisix
+
     sudo PATH=$PATH apisix help
     sudo PATH=$PATH apisix init
     sudo PATH=$PATH apisix start