This is an automated email from the ASF dual-hosted git repository.
tzssangglass pushed a commit to branch release/2.10
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/release/2.10 by this push:
new 1c6cd3606 ci: backport some high version changes to make CI pass
1c6cd3606 is described below
commit 1c6cd360681579b4f7864cd83cde6ab44fb00289
Author: tzssangglass <[email protected]>
AuthorDate: Fri Sep 23 18:03:37 2022 +0800
ci: backport some high version changes to make CI pass
---
.github/actions/action-tmate | 1 -
.github/workflows/build.yml | 2 +-
.github/workflows/chaos.yml | 11 ++----
.github/workflows/fuzzing-ci.yaml | 2 ++
.gitmodules | 3 --
t/chaos/utils/Dockerfile | 75 +++++++++++++++++++++++++++++++++++++++
6 files changed, 80 insertions(+), 14 deletions(-)
diff --git a/.github/actions/action-tmate b/.github/actions/action-tmate
deleted file mode 160000
index 079a16b22..000000000
--- a/.github/actions/action-tmate
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 079a16b22b8bcc5dd231a42d9a5e8e48db564688
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eaca2428f..ff2f8d7d0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
platform:
- - ubuntu-18.04
+ - ubuntu-20.04
os_name:
- linux_openresty
- linux_openresty_1_17
diff --git a/.github/workflows/chaos.yml b/.github/workflows/chaos.yml
index c83787037..df9e3d56d 100644
--- a/.github/workflows/chaos.yml
+++ b/.github/workflows/chaos.yml
@@ -21,7 +21,7 @@ jobs:
- name: Setup go
uses: actions/[email protected]
with:
- go-version: "1.16"
+ go-version: "1.17"
- uses: actions/cache@v2
with:
@@ -35,9 +35,8 @@ jobs:
- name: Creating minikube cluster
run: |
bash ./t/chaos/utils/setup_chaos_utils.sh start_minikube
- wget
https://raw.githubusercontent.com/apache/apisix-docker/master/alpine-local/Dockerfile
mkdir logs
- docker build -t apache/apisix:alpine-local --build-arg APISIX_PATH=.
-f Dockerfile .
+ docker build -t apache/apisix:alpine-local --build-arg APISIX_PATH=.
-f ./t/chaos/utils/Dockerfile .
minikube cache add apache/apisix:alpine-local -v 7 --alsologtostderr
- name: Print cluster information
@@ -80,9 +79,3 @@ jobs:
- name: Run test
working-directory: ./t/chaos
run: ginkgo -r --v --progress --trace
-
- # Debug via SSH if previous steps failed
- - name: Set up tmate session
- if: ${{ failure() }}
- uses: ./.github/actions/action-tmate
- timeout-minutes: 15
diff --git a/.github/workflows/fuzzing-ci.yaml
b/.github/workflows/fuzzing-ci.yaml
index 20d393f89..b252b19e4 100644
--- a/.github/workflows/fuzzing-ci.yaml
+++ b/.github/workflows/fuzzing-ci.yaml
@@ -63,6 +63,8 @@ jobs:
- name: install boofuzz
run: |
+ # Avoid "ERROR: flask has requirement click>=8.0, but you'll have
click 7.0 which is incompatible"
+ sudo apt remove python3-click
pip install -r $PWD/t/fuzzing/requirements.txt
- name: run simpleroute test
diff --git a/.gitmodules b/.gitmodules
index 78dcdd805..beb354b89 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
[submodule "t/toolkit"]
path = t/toolkit
url = https://github.com/api7/test-toolkit.git
-[submodule ".github/actions/action-tmate"]
- path = .github/actions/action-tmate
- url = https://github.com/mxschmitt/action-tmate
diff --git a/t/chaos/utils/Dockerfile b/t/chaos/utils/Dockerfile
new file mode 100644
index 000000000..700108283
--- /dev/null
+++ b/t/chaos/utils/Dockerfile
@@ -0,0 +1,75 @@
+#
+# 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.
+#
+
+ARG ENABLE_PROXY=false
+
+FROM openresty/openresty:1.19.3.2-alpine-fat AS production-stage
+
+ARG ENABLE_PROXY
+ARG APISIX_PATH
+COPY $APISIX_PATH ./apisix
+RUN set -x \
+ && (test "${ENABLE_PROXY}" != "true" || /bin/sed -i
's,http://dl-cdn.alpinelinux.org,https://mirrors.aliyun.com,g'
/etc/apk/repositories) \
+ && apk add --no-cache --virtual .builddeps \
+ automake \
+ autoconf \
+ libtool \
+ pkgconfig \
+ cmake \
+ git \
+ openldap-dev \
+ pcre-dev \
+ && cd apisix \
+ && git config --global url.https://github.com/.insteadOf git://github.com/
\
+ && make deps \
+ && cp -v bin/apisix /usr/bin/ \
+ && mv ../apisix /usr/local/apisix \
+ && apk del .builddeps build-base make unzip
+
+FROM alpine:3.13 AS last-stage
+
+ARG ENABLE_PROXY
+# add runtime for Apache APISIX
+RUN set -x \
+ && (test "${ENABLE_PROXY}" != "true" || /bin/sed -i
's,http://dl-cdn.alpinelinux.org,https://mirrors.aliyun.com,g'
/etc/apk/repositories) \
+ && apk add --no-cache \
+ bash \
+ curl \
+ libstdc++ \
+ openldap \
+ pcre \
+ tzdata
+
+WORKDIR /usr/local/apisix
+
+COPY --from=production-stage /usr/local/openresty/ /usr/local/openresty/
+COPY --from=production-stage /usr/local/apisix/ /usr/local/apisix/
+COPY --from=production-stage /usr/bin/apisix /usr/bin/apisix
+
+# forward request and error logs to docker log collector
+RUN mkdir -p logs && touch logs/access.log && touch logs/error.log \
+ && ln -sf /dev/stdout /usr/local/apisix/logs/access.log \
+ && ln -sf /dev/stderr /usr/local/apisix/logs/error.log
+
+ENV
PATH=$PATH:/usr/local/openresty/luajit/bin:/usr/local/openresty/nginx/sbin:/usr/local/openresty/bin
+
+EXPOSE 9080 9443
+
+CMD ["sh", "-c", "/usr/bin/apisix init && /usr/bin/apisix init_etcd &&
/usr/local/openresty/bin/openresty -p /usr/local/apisix -g 'daemon off;'"]
+
+STOPSIGNAL SIGQUIT
+
