misc(git) re-implement some changes

Author: hutchic

.ci/run_tests.sh

@@ -2,25 +2,15 @@
 set -e
 
 export BUSTED_ARGS="-o gtest -v --exclude-tags=flaky,ipv6"
-export TEST_CMD="bin/busted $BUSTED_ARGS"
 
-createuser --createdb kong
-createdb -U kong kong_tests
-
-if [ "$TEST_SUITE" == "lint" ]; then
-    make lint
-elif [ "$TEST_SUITE" == "unit" ]; then
-    make test
-elif [ "$TEST_SUITE" == "integration" ]; then
-    make test-integration
-elif [ "$TEST_SUITE" == "plugins" ]; then
-    make test-plugins
-elif [ "$TEST_SUITE" == "pdk" ]; then
-    TEST_NGINX_RANDOMIZE=1 prove -I. -j$JOBS -r t/01-pdk
-elif [ "$TEST_SUITE" == "old-unit" ]; then
-    make old-test
-elif [ "$TEST_SUITE" == "old-integration" ]; then
-    make old-test-integration
-elif [ "$TEST_SUITE" == "old-plugins" ]; then
-    make old-test-plugins
-fi
+if [ "$KONG_TEST_DATABASE" == "postgres" ]; then
+    export TEST_CMD="bin/busted $BUSTED_ARGS,cassandra"
+    eval "$TEST_CMD" spec/02-integration/
+    eval "$TEST_CMD" spec/03-plugins/
+    eval "$TEST_CMD" spec-old-api/02-integration/
+    eval "$TEST_CMD" spec-old-api/03-plugins/
+elif [ "$KONG_TEST_DATABASE" == "cassandra" ]; then
+    export TEST_CMD="bin/busted $BUSTED_ARGS,postgres"
+    eval "$TEST_CMD" spec/02-integration/
+    eval "$TEST_CMD" spec/03-plugins/
+fi

.ci/setup_env.sh

@@ -108,22 +108,22 @@ eval `luarocks path`
 # -------------------------------------
 # Install ccm & setup Cassandra cluster
 # -------------------------------------
-if [[ "$TEST_SUITE" != "unit" ]] && [[ "$TEST_SUITE" != "lint" ]]; then
-  echo "Installing ccm and setting up Cassandra cluster..."
-  pip install --user PyYAML six ccm &> build.log || (cat build.log && exit 1)
-  ccm create test -v $CASSANDRA -n 1 -d
-  ccm start -v
-  ccm status
+if [[ "$KONG_TEST_DATABASE" == "cassandra" ]]; then
+  echo "Setting up Cassandra"
+  docker run -d --name=cassandra --rm -p 7199:7199 -p 7000:7000 -p 9160:9160 -p 9042:9042 cassandra:$CASSANDRA
+  grep -q 'Created default superuser role' <(docker logs -f cassandra)
 fi
 
 # -------------------
 # Install Test::Nginx
 # -------------------
-echo "Installing CPAN dependencies..."
-chmod +x $CPAN_DOWNLOAD/cpanm
-cpanm --notest Test::Nginx &> build.log || (cat build.log && exit 1)
-cpanm --notest --local-lib=$TRAVIS_BUILD_DIR/perl5 local::lib && eval $(perl -I $TRAVIS_BUILD_DIR/perl5/lib/perl5/ -Mlocal::lib)
+if [[ "$TEST_SUITE" == "pdk" ]]; then
+  echo "Installing CPAN dependencies..."
+  chmod +x $CPAN_DOWNLOAD/cpanm
+  cpanm --notest Test::Nginx &> build.log || (cat build.log && exit 1)
+  cpanm --notest --local-lib=$TRAVIS_BUILD_DIR/perl5 local::lib && eval $(perl -I $TRAVIS_BUILD_DIR/perl5/lib/perl5/ -Mlocal::lib)
+fi
 
 nginx -V
 resty -V
-luarocks --version
+luarocks --version