From 5fd6f663243c07373b9532315059dd8a6e4d6dc1 Mon Sep 17 00:00:00 2001
From: Frederik Ring <frederik.ring@gmail.com>
Date: Sun, 11 Jul 2021 20:21:17 +0200
Subject: [PATCH] label container in cli test

---
 .circleci/config.yml            | 2 +-
 test/cli/run.sh                 | 3 ++-
 test/compose/docker-compose.yml | 2 +-
 test/swarm/docker-compose.yml   | 2 +-
 test/test.sh                    | 4 +++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5b8e8b1..94d4181 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,7 +15,7 @@ jobs:
           name: Run tests
           working_directory: ~/docker-volume-backup/test
           command: |
-            ./test.sh
+            ./test.sh canary
 
   build:
     docker:
diff --git a/test/cli/run.sh b/test/cli/run.sh
index dd4176f..9b3f1d7 100755
--- a/test/cli/run.sh
+++ b/test/cli/run.sh
@@ -23,6 +23,7 @@ docker exec minio mkdir -p /data/backup
 docker run -d \
   --name offen \
   --network test_network \
+  --label "docker-volume-backup.stop-during-backup=true" \
   -v app_data:/var/opt/offen/ \
   offen/offen:latest
 
@@ -40,7 +41,7 @@ docker run -d \
   --env AWS_S3_BUCKET_NAME=backup \
   --env BACKUP_FILENAME=test.tar.gz \
   --env BACKUP_CRON_EXPRESSION="0 0 5 31 2 ?" \
-  offen/docker-volume-backup:canary
+  offen/docker-volume-backup:$TEST_VERSION
 
 docker exec backup backup
 
diff --git a/test/compose/docker-compose.yml b/test/compose/docker-compose.yml
index f9e942e..1609164 100644
--- a/test/compose/docker-compose.yml
+++ b/test/compose/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - backup_data:/data
 
   backup: &default_backup_service
-    image: offen/docker-volume-backup:canary
+    image: offen/docker-volume-backup:${TEST_VERSION}
     depends_on:
       - minio
     restart: always
diff --git a/test/swarm/docker-compose.yml b/test/swarm/docker-compose.yml
index a6f2aa7..c188e2b 100644
--- a/test/swarm/docker-compose.yml
+++ b/test/swarm/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       - backup_data:/data
 
   backup: &default_backup_service
-    image: offen/docker-volume-backup:canary
+    image: offen/docker-volume-backup:${TEST_VERSION}
     depends_on:
       - minio
     deploy:
diff --git a/test/test.sh b/test/test.sh
index b33edd4..7d34edd 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -2,13 +2,15 @@
 
 set -e
 
+TEST_VERSION=${1:-canary}
+
 for dir in $(ls -d -- */); do
   test="${dir}run.sh"
   echo "################################################"
   echo "Now running $test"
   echo "################################################"
   echo ""
-  /bin/sh $test
+  TEST_VERSION=$TEST_VERSION /bin/sh $test
   echo ""
   echo "$test passed"
   echo ""