Don't assume "fcci--vg-" prefix in tools/docker/entrypoint.sh

Our EC2 instance has this volume group, but other environments would
not.

Signed-off-by: Kazuyoshi Kato <[email protected]>

Author: kzys

.buildkite/al2_pipeline.yml

@@ -21,6 +21,7 @@ steps:
     env:
       DOCKER_IMAGE_TAG: "$BUILDKITE_BUILD_NUMBER"
       EXTRAGOARGS: "-race"
+      FICD_DM_VOLUME_GROUP: "fcci-vg"
     command:
       - ./.buildkite/setup_al2.sh
       - docker run --rm -v $PWD:/mnt debian:stretch-slim rm -rf /mnt/tools/image-builder/rootfs

.buildkite/al2_test.sh

@@ -6,7 +6,8 @@ source ./.buildkite/al2env.sh
 export PATH=$bin_path:$PATH
 export FIRECRACKER_CONTAINERD_RUNTIME_CONFIG_PATH=$runtime_config_path
 export ENABLE_ISOLATED_TESTS=true
-export CONTAINERD_SOCKET=$dir/containerd.sock 
+export CONTAINERD_SOCKET=$dir/containerd.sock
+
 export SHIM_BASE_DIR=$dir
 
 sudo -E PATH=$PATH $bin_path/firecracker-containerd --config $dir/config.toml &

.buildkite/pipeline.yml

@@ -98,23 +98,25 @@ steps:
       DOCKER_IMAGE_TAG: "$BUILDKITE_BUILD_NUMBER"
       NUMBER_OF_VMS: 100
       EXTRAGOARGS: "-v -count=1 -race"
+      FICD_DM_VOLUME_GROUP: fcci-vg
     artifact_paths:
       - "runtime/logs/*"
     command:
       - make -C runtime integ-test FICD_DM_POOL=build_${BUILDKITE_BUILD_NUMBER}_runtime
     timeout_in_minutes: 15
 
-  - label: ":rotating_light: :exclamation: example tests (devmapper)"
+  - label: ":rotating_light: :exclamation: example tests"
     agents:
       queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
       distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
       hostname: "${BUILDKITE_AGENT_META_DATA_HOSTNAME}"
     env:
       DOCKER_IMAGE_TAG: "$BUILDKITE_BUILD_NUMBER"
       EXTRAGOARGS: "-v -count=1"
+      FICD_DM_VOLUME_GROUP: fcci-vg
     artifact_paths:
       - "examples/logs/*"
     command:
-      - make -C examples integ-test TEST_SS=devmapper TEST_POOL=build_${BUILDKITE_BUILD_NUMBER}_example
+      - make -C examples integ-test TEST_POOL=build_${BUILDKITE_BUILD_NUMBER}_example
     timeout_in_minutes: 10
 

tools/docker/entrypoint.sh

@@ -5,10 +5,16 @@ chmod a+rwx ${FICD_LOG_DIR}
 
 mkdir -p /etc/containerd/snapshotter
 
+if [[ -z "$FICD_DM_VOLUME_GROUP" ]]; then
+   pool_name="${FICD_DM_POOL}"
+else
+   pool_name="$(echo "$FICD_DM_VOLUME_GROUP" | sed s/-/--/g)-${FICD_DM_POOL}"
+fi
+
 cat > /etc/containerd/snapshotter/devmapper.toml <<EOF
 [plugins]
   [plugins.devmapper]
-    pool_name = "fcci--vg-${FICD_DM_POOL}"
+    pool_name = "${pool_name}"
     base_image_size = "1024MB"
 EOF