Merge pull request #528 from 3scale/cpan-test-apicast

[t] use Test::APIcast from CPAN

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
     environment:
       S2I_VERSION: "1.1.7-226afa1"
       DOCKER_COMPOSE_VERSION: "1.16.1"
-      OPENRESTY_VERSION: "1.13.6.1-rover2"
+      OPENRESTY_VERSION: "1.13.6.1-rover3"
     steps:
       - run: apk update && apk add wget make bash curl py-pip git openssh-client
       - run: |
@@ -37,7 +37,7 @@ jobs:
       - run: make prove-docker
   build:
     docker:
-      - image: quay.io/3scale/s2i-openresty-centos7:1.13.6.1-rover2
+      - image: quay.io/3scale/s2i-openresty-centos7:1.13.6.1-rover3
         environment:
           TEST_NGINX_BINARY: openresty
           LUA_BIN_PATH: /opt/app-root/bin
@@ -58,11 +58,20 @@ jobs:
             - lua_modules
       - run: mkdir -p tmp/junit
       - run: $(make rover) exec make busted
+      - restore_cache:
+          keys:
+            - apicast-cpanm-{{ arch }}-{{ checksum "gateway/cpanfile" }}
+            - apicast-cpanm-{{ arch }}-{{ .Branch }}
+            - apicast-cpanm-{{ arch }}-master
       - run:
-          command: make prove
+          command: /usr/libexec/s2i/entrypoint make prove
           environment:
             JUNIT_OUTPUT_FILE: tmp/junit/prove.xml
             HARNESS: TAP::Harness::JUnit
+      - save_cache:
+          key: apicast-cpanm-{{ arch }}-{{ checksum "gateway/cpanfile" }}
+          paths:
+            - ~/perl5
       - store_test_results:
           path: tmp/junit
       - store_artifacts:

CHANGELOG.md

@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Consolidate apicast-0.1-0.rockspec into apicast-scm-1.rockspec [PR #526](https://github.com/3scale/apicast/pull/526)
 - Deprecated `Configuration.extract_usage` in favor of `Service.get_usage` [PR #531](https://github.com/3scale/apicast/pull/531)
+- Extract Test::APIcast to own package on CPAN [PR #528](https://github.com/3scale/apicast/pull/528)
 
 ## [3.2.0-alpha2] - 2017-11-30
 

Makefile

@@ -31,6 +31,8 @@ ifeq ($(ROVER),)
 ROVER := lua_modules/bin/rover
 endif
 
+CPANM ?= $(shell command -v cpanm 2> /dev/null)
+
 export COMPOSE_PROJECT_NAME
 
 test: ## Run all tests
@@ -53,6 +55,10 @@ nginx:
 prove: HARNESS ?= TAP::Harness
 prove: export TEST_NGINX_RANDOMIZE=1
 prove: $(ROVER) nginx ## Test nginx
+ifeq ($(CPANM),)
+	$(error Missing cpanminus. Install it by running `curl -L https://cpanmin.us | perl - App::cpanminus`)
+endif
+	$(CPANM) --installdeps ./gateway
 	$(ROVER) exec prove -j$(NPROC) --harness=$(HARNESS) 2>&1 | awk '/found ONLY/ { print "FAIL: because found ONLY in test"; print; exit 1 }; { print }'
 
 prove-docker: apicast-source

docker-compose.yml

@@ -33,11 +33,10 @@ services:
   prove:
     image: ${IMAGE_NAME:-apicast-test}
     user: root
-    entrypoint: "bash -ec"
     environment:
       TEST_NGINX_BINARY: openresty
       TEST_NGINX_REDIS_HOST: redis
-    command: "'$$TEST_NGINX_BINARY -V; cd ; make prove; exit $$?'"
+    command: "sh -ec '$$TEST_NGINX_BINARY -V; cd ; /usr/libexec/s2i/entrypoint make prove; exit $$?'"
     dns_search:
       - example.com
     depends_on:

gateway/cpanfile

@@ -0,0 +1,3 @@
+requires 'Test::APIcast', '0.03';
+requires 'JSON::WebToken';
+requires 'Crypt::OpenSSL::RSA';