WIP: Move ci.yml to app directory

Author: delner

.circleci/config.yml

@@ -197,9 +197,11 @@ orbs:
           - setup_remote_docker:
               docker_layer_caching: true
           - run:
-              command: ./integration/bin/build-images -a
+              command: ./integration/bin/build-images
           - run:
-              command: ./integration/bin/ci
+              command: ./integration/apps/rack/bin/build-images
+          - run:
+              command: ./integration/apps/rack/bin/ci -v 2.7
       test:
         <<: *test_job_default
         docker:

integration/apps/rack/bin/ci

@@ -0,0 +1,50 @@
+#!/bin/bash
+set -euo pipefail
+
+APP_BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+APP_DIR=${APP_BIN_DIR%/bin}
+cd $APP_DIR
+
+# Parse options
+while getopts "v:" opt; do
+  case $opt in
+    v)
+      APP_RUBY_VERSION=$OPTARG
+      ;;
+    \?)
+      echo "Invalid option: -$OPTARG" >&2
+      exit 1
+      ;;
+    :)
+      echo "Option -$OPTARG requires an argument." >&2
+      exit 1
+      ;;
+  esac
+done
+
+# Validate options
+if [ -z ${APP_RUBY_VERSION+x} ]; then
+  echo "You must specify a Ruby version with -v. (e.g. 2.7)" >&2
+  exit 1
+fi
+
+# Set configuration
+APP_BASE_IMAGE=${APP_BASE_IMAGE:-datadog/dd-apm-demo:rb-$APP_RUBY_VERSION}
+APP_IMAGE=${APP_IMAGE:-$APP_BASE_IMAGE-rack}
+APP_COMPOSE_FILES="-f docker-compose.yml -f docker-compose.ci.yml"
+
+echo "== Running integration tests... =="
+echo " - App: rack"
+echo " - Ruby version: $APP_RUBY_VERSION"
+echo " - Base image: $APP_BASE_IMAGE"
+echo " - App image: $APP_IMAGE"
+echo ""
+
+# Pull/build any missing images
+APP_IMAGE=$APP_IMAGE docker-compose $APP_COMPOSE_FILES build
+
+# Run the test suite
+APP_IMAGE=$APP_IMAGE docker-compose $APP_COMPOSE_FILES run tester
+
+# Cleanup
+APP_IMAGE=$APP_IMAGE docker-compose $APP_COMPOSE_FILES down -t 0 --remove-orphans

integration/apps/rack/docker-compose.ci.yml

@@ -0,0 +1,9 @@
+version: '3.2'
+services:
+  app:
+    image: ${APP_IMAGE}
+  tester:
+    image: ${APP_IMAGE}
+  ddagent:
+    environment:
+      - DD_API_KEY=invalid_api_key

integration/apps/rack/docker-compose.yml

@@ -47,9 +47,10 @@ services:
       - "8125/udp"
       - "8126"
     volumes:
-      - type: bind
-        source: ../../config/agent.yaml
-        target: /etc/datadog-agent/datadog.yaml
+      - ../../config/agent.yaml:/etc/datadog-agent/datadog.yaml
+      # - type: bind
+      #   source: ../../config/agent.yaml
+      #   target: /etc/datadog-agent/datadog.yaml
       # For monitoring performance of containers (e.g. CPU, Memory, etc...)
       # - type: bind
       #   source: /var/run/docker.sock
@@ -65,7 +66,7 @@ services:
       context: .
       args:
         BASE_IMAGE: datadog/dd-apm-demo:rb-2.7
-    command: ./bin/rspec
+    command: bin/rspec
     depends_on:
       - app
     environment:

integration/bin/ci

@@ -7,7 +7,7 @@ cd $INTEGRATION_DIR
 
 # Set base image version
 INTEGRATION_VERSIONS=( "2.2" "2.5" "2.7" )
-INTEGRATION_APPS=( "rack")
+INTEGRATION_APPS=( "rack" )
 
 echo "== Starting CI test suite... =="
 echo " - Apps: $INTEGRATION_APPS"
@@ -19,7 +19,8 @@ do
     for version in "${INTEGRATION_VERSIONS[@]}"
     do
         :
-        ./bin/test -a $app -v $version
+        # ./bin/test -a $app -v $version
+        bash $INTEGRATION_DIR/apps/$app/bin/ci -v $version
     done
 done
 

integration/bin/test

@@ -38,7 +38,7 @@ fi
 
 # Set configuration
 INTEGRATION_BASE_IMAGE=${INTEGRATION_BASE_IMAGE:-datadog/dd-apm-demo:rb-$INTEGRATION_RUBY_VERSION}
-INTEGRATION_APP_IMAGE=${INTEGRATION_APP_IMAGE:-datadog/dd-apm-demo:rb-$INTEGRATION_RUBY_VERSION-$INTEGRATION_APP}
+INTEGRATION_APP_IMAGE=${INTEGRATION_APP_IMAGE:-$INTEGRATION_BASE_IMAGE-$INTEGRATION_APP}
 INTEGRATION_COMPOSE_FILES="-f $INTEGRATION_DIR/apps/$INTEGRATION_APP/docker-compose.yml -f docker-compose.ci.yml"
 
 echo "== Running integration tests... =="
@@ -49,13 +49,10 @@ echo " - App image: $INTEGRATION_APP_IMAGE"
 echo ""
 
 # Pull/build any missing images
-# BASE_IMAGE=$INTEGRATION_BASE_IMAGE docker-compose $INTEGRATION_COMPOSE_FILES build
 APP_IMAGE=$INTEGRATION_APP_IMAGE docker-compose $INTEGRATION_COMPOSE_FILES build
 
 # Run the test suite
-# BASE_IMAGE=$INTEGRATION_BASE_IMAGE docker-compose $INTEGRATION_COMPOSE_FILES run tester /bin/bash
 APP_IMAGE=$INTEGRATION_APP_IMAGE docker-compose $INTEGRATION_COMPOSE_FILES run tester
 
 # Cleanup
-# BASE_IMAGE=$INTEGRATION_BASE_IMAGE docker-compose $INTEGRATION_COMPOSE_FILES down -t 0 --remove-orphans
 APP_IMAGE=$INTEGRATION_APP_IMAGE docker-compose $INTEGRATION_COMPOSE_FILES down -t 0 --remove-orphans