This is an automated email from the ASF dual-hosted git repository.
chenjunxu 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 206a807 ci: more retry on fetching lua rocks (#4029)
206a807 is described below
commit 206a807ff6a3e31e8117ddbab7d0e711fc2038ec
Author: Shuyang Wu <[email protected]>
AuthorDate: Tue Apr 13 14:04:36 2021 +0800
ci: more retry on fetching lua rocks (#4029)
---
.github/workflows/fuzzing-ci.yaml | 8 +++++++-
ci/linux_apisix_master_luarocks_runner.sh | 10 +++++++++-
ci/linux_openresty_common_runner.sh | 11 ++++++++++-
ci/linux_openresty_mtls_runner.sh | 11 ++++++++++-
ci/linux_tengine_runner.sh | 10 +++++++++-
utils/install-apisix.sh | 20 ++++++++++++++------
6 files changed, 59 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/fuzzing-ci.yaml
b/.github/workflows/fuzzing-ci.yaml
index 9da05af..703b11d 100644
--- a/.github/workflows/fuzzing-ci.yaml
+++ b/.github/workflows/fuzzing-ci.yaml
@@ -43,7 +43,13 @@ jobs:
sudo apt-get install -y git openresty curl openresty-openssl111-dev
unzip make gcc
./utils/linux-install-luarocks.sh
- make deps
+ for (( i = 0; i < 10; i++ )); do
+ if [[ "$i" -eq 10 ]]; then
+ echo "failed to make deps in time"
+ exit 1
+ fi
+ make deps && break
+ done
make init
make run
diff --git a/ci/linux_apisix_master_luarocks_runner.sh
b/ci/linux_apisix_master_luarocks_runner.sh
index c889ed2..f0f14a4 100755
--- a/ci/linux_apisix_master_luarocks_runner.sh
+++ b/ci/linux_apisix_master_luarocks_runner.sh
@@ -53,7 +53,15 @@ script() {
sudo PATH=$PATH ./utils/install-apisix.sh remove > build.log 2>&1 || (cat
build.log && exit 1)
# install APISIX by luarocks
- sudo luarocks install $APISIX_MAIN > build.log 2>&1 || (cat build.log &&
exit 1)
+ for (( i = 0; i < 10; i++ )); do
+ if [[ "$i" -eq 10 ]]; then
+ echo "failed to fetch lua rocks in time"
+ cat build.log && exit 1
+ exit 1
+ fi
+ sudo luarocks install $APISIX_MAIN > build.log 2>&1 && break
+ i=$(( i + 1 ))
+ done
cp ../bin/apisix /usr/local/bin/apisix
# show install files
diff --git a/ci/linux_openresty_common_runner.sh
b/ci/linux_openresty_common_runner.sh
index 1fa81b7..c6fd2f2 100755
--- a/ci/linux_openresty_common_runner.sh
+++ b/ci/linux_openresty_common_runner.sh
@@ -50,7 +50,16 @@ do_install() {
./utils/linux-install-openresty.sh
./utils/linux-install-luarocks.sh
- sudo luarocks install luacheck > build.log 2>&1 || (cat build.log && exit
1)
+
+ for (( i = 0; i < 10; i++ )); do
+ if [[ "$i" -eq 10 ]]; then
+ echo "failed to install luacheck in time"
+ cat build.log && exit 1
+ exit 1
+ fi
+ sudo luarocks install luacheck > build.log 2>&1 && break
+ i=$(( i + 1 ))
+ done
./utils/linux-install-etcd-client.sh
diff --git a/ci/linux_openresty_mtls_runner.sh
b/ci/linux_openresty_mtls_runner.sh
index f8ff7a0..a1a8bd9 100755
--- a/ci/linux_openresty_mtls_runner.sh
+++ b/ci/linux_openresty_mtls_runner.sh
@@ -28,7 +28,16 @@ do_install() {
./utils/linux-install-openresty.sh
./utils/linux-install-luarocks.sh
- sudo luarocks install luacheck > build.log 2>&1 || (cat build.log && exit
1)
+
+ for (( i = 0; i < 10; i++ )); do
+ if [[ "$i" -eq 10 ]]; then
+ echo "failed to install luacheck in time"
+ cat build.log && exit 1
+ exit 1
+ fi
+ sudo luarocks install luacheck > build.log 2>&1 && break
+ i=$(( i + 1 ))
+ done
./utils/linux-install-etcd-client.sh
diff --git a/ci/linux_tengine_runner.sh b/ci/linux_tengine_runner.sh
index e50afdf..802e427 100755
--- a/ci/linux_tengine_runner.sh
+++ b/ci/linux_tengine_runner.sh
@@ -235,7 +235,15 @@ do_install() {
fi
fi
- sudo luarocks install luacheck > build.log 2>&1 || (cat build.log && exit
1)
+ for (( i = 0; i < 10; i++ )); do
+ if [[ "$i" -eq 10 ]]; then
+ echo "failed to install luacheck in time"
+ cat build.log && exit 1
+ exit 1
+ fi
+ sudo luarocks install luacheck > build.log 2>&1 && break
+ i=$(( i + 1 ))
+ done
./utils/linux-install-etcd-client.sh
diff --git a/utils/install-apisix.sh b/utils/install-apisix.sh
index 92a3dd6..91e0142 100755
--- a/utils/install-apisix.sh
+++ b/utils/install-apisix.sh
@@ -42,12 +42,20 @@ echo $UNAME
do_install() {
- if [ "$LUAROCKS_VER" = 'luarocks 3.' ]; then
- sudo luarocks install --lua-dir=$LUA_JIT_DIR $APISIX_VER
--tree=/usr/local/apisix/deps --local
-
- else
- sudo luarocks install $APISIX_VER --tree=/usr/local/apisix/deps --local
- fi
+ i=0
+ while true; do
+ if [ "$i" = "10" ]; then
+ echo "failed to install in time"
+ cat build.log && exit 1
+ exit 1
+ fi
+ if [ "$LUAROCKS_VER" = 'luarocks 3.' ]; then
+ sudo luarocks install --lua-dir=$LUA_JIT_DIR $APISIX_VER
--tree=/usr/local/apisix/deps --local > build.log 2>&1 && break
+ else
+ sudo luarocks install $APISIX_VER --tree=/usr/local/apisix/deps
--local > build.log 2>&1 && break
+ fi
+ i=$(( i + 1 ))
+ done
sudo rm -f /usr/bin/apisix
sudo ln -s /usr/local/apisix/deps/bin/apisix /usr/bin/apisix
