Merge pull request #936 from metacpan/oalders/workflows

Test docker-compose via CircleCI

Author: ssoriche

.circleci/config.yml

@@ -1,13 +1,63 @@
 # Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
 # Use a package of configuration called an orb.
-orbs:
-  # Declare a dependency on the welcome-orb
-  welcome: circleci/[email protected]
 # Orchestrate or schedule a set of jobs
 workflows:
-  # Name the workflow "welcome"
-  welcome:
+  docker-compose:
     # Run the welcome/run job in its own container
     jobs:
-      - welcome/run
+      - build-and-test
+jobs:
+  build-and-test:
+    machine: true
+    resource_class: medium
+    steps:
+      - run:
+          name: Install Docker Compose
+          command: |
+            set -x
+            curl -L https://github.com/docker/compose/releases/download/1.26.2/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
+            sudo chmod +x ~/docker-compose
+      - run:
+          command: |
+            git clone https://github.com/metacpan/metacpan-docker.git
+            cd metacpan-docker
+          name: metacpan-docker checkout
+      - run:
+          command: |
+            pushd metacpan-docker
+            ./bin/metacpan-docker init
+          name: clone missing repositories
+      - run:
+          command: |
+            pushd metacpan-docker/src/metacpan-api
+            git checkout -b ${CIRCLE_BRANCH} origin/${CIRCLE_BRANCH}
+          name: metacpan-api checkout
+      - run:
+          command: |
+            pushd metacpan-docker
+            ~/docker-compose build --build-arg CPM_ARGS='--with-test' api_test
+          name: compose build
+      - run:
+          command: |
+            pushd metacpan-docker
+            ./bin/metacpan-docker init
+            ~/docker-compose --verbose up -d api_test
+          name: compose up
+      - run:
+          command: |
+            pushd metacpan-docker/src/metacpan-api
+            ./wait-for-es.sh http://localhost:9200
+          name: wait for ES
+      - run:
+          command: |
+            pushd metacpan-docker
+            ~/docker-compose exec -T api_test prove -lr --jobs 2 t
+      - run:
+          command: |
+            pushd metacpan-docker
+            ~/docker-compose logs
+            docker stats --no-stream
+            docker ps -a | head
+          name: docker-compose logs
+          when: on_fail

cpanfile

@@ -1,3 +1,6 @@
+use strict;
+use warnings;
+
 requires 'perl', '5.010';
 
 requires 'Archive::Any', '0.0942';
@@ -130,7 +133,6 @@ requires 'Mozilla::CA';
 requires 'namespace::autoclean';
 requires 'Net::DNS::Paranoid';
 requires 'Net::Fastly', '1.05';
-requires 'Net::OpenID::Consumer';
 requires 'Net::Twitter', '4.01010';
 requires 'OrePAN2';
 requires 'Parse::CPAN::Packages::Fast', '0.09';
@@ -193,7 +195,6 @@ requires 'Plack::Test::Agent';
 requires 'Test::Code::TidyAll';
 requires 'Test::More', '0.99';
 requires 'Test::Most';
-requires 'Test::OpenID::Server', '0.03';
 requires 'Test::Perl::Critic';
 requires 'Test::RequiresInternet';
 requires 'Test::Routine', '0.012';

lib/MetaCPAN/Server/Controller/Login/OpenID.pm

@@ -7,10 +7,6 @@ minion_dsn = postgresql:///minion_queue
     private_key 59125ffc09413eed3f2a2c07a37c7a44b95633e2
 </controller>
 
-<controller Login::OpenID>
-    secret_key 8225b1874fdc431cedb1cf7d454a92b8fde3a5e6
-</controller>
-
 <smtp>
     host      smtp.fastmail.com
     port      465

metacpan_server.conf

@@ -3,40 +3,36 @@
 # Courtesy of @fxdgear
 # https://github.com/elastic/elasticsearch-py/issues/778#issuecomment-384389668
 
-set -e
+set -ux
 
 host="$1"
-shift
-cmd="$@"
-
-
-until $(curl --output /dev/null --silent --head --fail "$host"); do
-    printf '.'
-    sleep 1
-done
 
-# First wait for ES to start...
-response=$(curl $host)
+while true; do
+    response=$(curl --write-out '%{http_code}' --silent --fail --output /dev/null "$host")
+    if [[ "$response" -eq "200" ]]; then
+        break
+    fi
 
-until [ "$response" = "200" ]; do
-    response=$(curl --write-out %{http_code} --silent --output /dev/null "$host")
-    >&2 echo "Elastic Search is unavailable - sleeping"
+    echo "Elastic Search is unavailable - sleeping" >&2
     sleep 1
 done
 
+# set -e now because it was causing the curl command above to exit the script
+# if the server was not available
+set -e
 
-# Wait for ES status to turn to yellow.
-# TODO: Ideally we'd be waiting for green, but we need multiple nodes for that.
-
-health="$(curl -fsSL "$host/_cat/health?h=status")"
-health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')" # trim whitespace (otherwise we'll have "green ")
-
-until [ "$health" = 'yellow' ]; do
+while true; do
+    ## Wait for ES status to turn to yellow.
+    ## TODO: Ideally we'd be waiting for green, but we need multiple nodes for that.
     health="$(curl -fsSL "$host/_cat/health?h=status")"
-    health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')" # trim whitespace (otherwise we'll have "green ")
-    >&2 echo "Elastic Search is unavailable ($health) - sleeping"
+    health="$(echo "$health" | xargs)" # trim whitespace (otherwise we'll have "green ")
+    if [[ $health == 'yellow' || $health == 'green' ]]; then
+        break
+    fi
+    echo "Elastic Search is unavailable ($health) - sleeping" >&2
     sleep 1
 done
 
->&2 echo "Elastic Search is up"
-exec $cmd
+echo "Elastic Search is up" >&2
+shift
+exec "$@"