Skip to content

Commit 8af49e0

Browse files
authored
chore(actions) remove use of KBT based build and Docker Hub based caching for CI runs
1 parent 3b71df2 commit 8af49e0

File tree

8 files changed

+361
-115
lines changed

8 files changed

+361
-115
lines changed

.ci/run_tests.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
set -ex
2+
set -e
33

44
function cyan() {
55
echo -e "\033[1;36m$*\033[0m"
@@ -12,17 +12,20 @@ export BUSTED_ARGS="--no-k -o htest -v --exclude-tags=flaky,ipv6,squid"
1212

1313
if [ "$KONG_TEST_DATABASE" == "postgres" ]; then
1414
export TEST_CMD="bin/busted $BUSTED_ARGS,cassandra,off"
15-
psql -v ON_ERROR_STOP=1 -h ${KONG_TEST_PG_HOST} -U ${KONG_TEST_PG_USER} -d ${KONG_TEST_PG_DATABASE} <<-EOSQL
15+
16+
psql -v ON_ERROR_STOP=1 -h localhost --username "$KONG_TEST_PG_USER" <<-EOSQL
1617
CREATE user ${KONG_TEST_PG_USER}_ro;
1718
GRANT CONNECT ON DATABASE $KONG_TEST_PG_DATABASE TO ${KONG_TEST_PG_USER}_ro;
1819
\c $KONG_TEST_PG_DATABASE;
1920
GRANT USAGE ON SCHEMA public TO ${KONG_TEST_PG_USER}_ro;
2021
ALTER DEFAULT PRIVILEGES FOR ROLE $KONG_TEST_PG_USER IN SCHEMA public GRANT SELECT ON TABLES TO ${KONG_TEST_PG_USER}_ro;
2122
EOSQL
23+
2224
elif [ "$KONG_TEST_DATABASE" == "cassandra" ]; then
2325
export KONG_TEST_CASSANDRA_KEYSPACE=kong_tests
2426
export KONG_TEST_DB_UPDATE_PROPAGATION=1
2527
export TEST_CMD="bin/busted $BUSTED_ARGS,postgres,off"
28+
2629
else
2730
export TEST_CMD="bin/busted $BUSTED_ARGS,postgres,cassandra,db"
2831
fi
@@ -102,7 +105,7 @@ if [ "$TEST_SUITE" == "plugins" ]; then
102105
fi
103106
fi
104107
if [ "$TEST_SUITE" == "pdk" ]; then
105-
TEST_NGINX_RANDOMIZE=1 prove -I. -j$JOBS -r t/01-pdk
108+
TEST_NGINX_RANDOMIZE=1 prove -I. -r t/01-pdk
106109
fi
107110
if [ "$TEST_SUITE" == "unit" ]; then
108111
unset KONG_TEST_NGINX_USER KONG_PG_PASSWORD KONG_TEST_PG_PASSWORD

.ci/setup_env_github.sh

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#!/usr/bin/env bash
2+
# set -e
3+
4+
dep_version() {
5+
grep $1 .requirements | sed -e 's/.*=//' | tr -d '\n'
6+
}
7+
8+
OPENRESTY=$(dep_version RESTY_VERSION)
9+
LUAROCKS=$(dep_version RESTY_LUAROCKS_VERSION)
10+
OPENSSL=$(dep_version RESTY_OPENSSL_VERSION)
11+
GO_PLUGINSERVER=$(dep_version KONG_GO_PLUGINSERVER_VERSION)
12+
PCRE=$(dep_version RESTY_PCRE_VERSION)
13+
14+
15+
#---------
16+
# Download
17+
#---------
18+
19+
DOWNLOAD_ROOT=${DOWNLOAD_ROOT:=/download-root}
20+
BUILD_TOOLS_DOWNLOAD=$GITHUB_WORKSPACE/kong-build-tools
21+
GO_PLUGINSERVER_DOWNLOAD=$GITHUB_WORKSPACE/go-pluginserver
22+
23+
KONG_NGINX_MODULE_BRANCH=${KONG_NGINX_MODULE_BRANCH:=master}
24+
25+
#--------
26+
# Install
27+
#--------
28+
INSTALL_ROOT=${INSTALL_ROOT:=/install-cache}
29+
30+
pushd $GO_PLUGINSERVER_DOWNLOAD
31+
go get ./...
32+
make
33+
34+
mkdir -p $INSTALL_ROOT/go-pluginserver
35+
cp go-pluginserver $INSTALL_ROOT/go-pluginserver/
36+
popd
37+
38+
kong-ngx-build \
39+
--work $DOWNLOAD_ROOT \
40+
--prefix $INSTALL_ROOT \
41+
--openresty $OPENRESTY \
42+
--kong-nginx-module $KONG_NGINX_MODULE_BRANCH \
43+
--luarocks $LUAROCKS \
44+
--openssl $OPENSSL \
45+
--pcre $PCRE \
46+
--debug
47+
48+
OPENSSL_INSTALL=$INSTALL_ROOT/openssl
49+
OPENRESTY_INSTALL=$INSTALL_ROOT/openresty
50+
LUAROCKS_INSTALL=$INSTALL_ROOT/luarocks
51+
52+
eval `luarocks path`
53+
54+
nginx -V
55+
resty -V
56+
luarocks --version
57+
openssl version

0 commit comments

Comments
 (0)