From 273d6b8ccf557dbd682dda5634590ebe0b877f64 Mon Sep 17 00:00:00 2001 From: monkeyDluffy6017 Date: Wed, 10 Jan 2024 10:16:46 +0800 Subject: [PATCH] ci: remove unnecessary ci file --- ci/common.sh | 1 - ci/linux_apisix_master_luarocks_runner.sh | 84 ----------------------- 2 files changed, 85 deletions(-) delete mode 100755 ci/linux_apisix_master_luarocks_runner.sh diff --git a/ci/common.sh b/ci/common.sh index 7609bcfd02d7..9aa132af1c06 100644 --- a/ci/common.sh +++ b/ci/common.sh @@ -23,7 +23,6 @@ export_version_info() { export_or_prefix() { export OPENRESTY_PREFIX="/usr/local/openresty" - export APISIX_MAIN="https://raw.githubusercontent.com/apache/apisix/master/apisix-master-0.rockspec" export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH export OPENSSL_PREFIX=$OPENRESTY_PREFIX/openssl3 export OPENSSL_BIN=$OPENSSL_PREFIX/bin/openssl diff --git a/ci/linux_apisix_master_luarocks_runner.sh b/ci/linux_apisix_master_luarocks_runner.sh deleted file mode 100755 index 4137f4399e3b..000000000000 --- a/ci/linux_apisix_master_luarocks_runner.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/env bash -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -. ./ci/common.sh - -do_install() { - linux_get_dependencies - install_brotli - - export_or_prefix - - ./ci/linux-install-openresty.sh - ./utils/linux-install-luarocks.sh - ./ci/linux-install-etcd-client.sh -} - -script() { - export_or_prefix - openresty -V - - sudo rm -rf /usr/local/apisix - - # run the test case in an empty folder - mkdir tmp && cd tmp - cp -r ../utils ./ - - # install APISIX by luarocks - luarocks install $APISIX_MAIN > build.log 2>&1 || (cat build.log && exit 1) - cp ../bin/apisix /usr/local/bin/apisix - - # show install files - luarocks show apisix - - sudo PATH=$PATH apisix help - sudo PATH=$PATH apisix init - sudo PATH=$PATH apisix start - sudo PATH=$PATH apisix quit - for i in {1..10} - do - if [ ! -f /usr/local/apisix/logs/nginx.pid ];then - break - fi - sleep 0.3 - done - sudo PATH=$PATH apisix start - sudo PATH=$PATH apisix stop - - # apisix cli test - # todo: need a more stable way - - grep '\[error\]' /usr/local/apisix/logs/error.log > /tmp/error.log | true - if [ -s /tmp/error.log ]; then - echo "=====found error log=====" - cat /usr/local/apisix/logs/error.log - exit 1 - fi -} - -case_opt=$1 -shift - -case ${case_opt} in -do_install) - do_install "$@" - ;; -script) - script "$@" - ;; -esac