Made pod-profile-mount-volume service yaml more configurable. (#2785)

d2iq-archive · Nov 28, 2018 · a9199ae · a9199ae
1 parent 6c63331
commit a9199ae
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/frameworks/helloworld/src/main/dist/pod-profile-mount-volume.yml b/frameworks/helloworld/src/main/dist/pod-profile-mount-volume.yml
@@ -14,7 +14,14 @@ pods:
       profile:
         goal: RUNNING
         essential: false
-        cmd: df -t $VOLUME_PROFILE pod-container-path >> pod-container-path/output && df -t $VOLUME_PROFILE profile-container-path >> profile-container-path/output && sleep $SLEEP_DURATION
+        cmd: >
+               set -e -x
+               [ -n "{{{TEST_PROFILE_VOLUME_COMMAND}}}" ]
+               {{{TEST_PROFILE_VOLUME_COMMAND}}} pod-container-path
+               {{{TEST_PROFILE_VOLUME_COMMAND}}} profile-container-path
+               echo profile >> pod-container-path/output
+               echo profile >> profile-container-path/output
+               sleep $SLEEP_DURATION
         cpus: {{HELLO_CPUS}}
         memory: {{HELLO_MEM}}
         env:
@@ -28,7 +35,14 @@ pods:
       noprofile:
         goal: RUNNING
         essential: false
-        cmd: df -t $VOLUME_PROFILE pod-container-path >> pod-container-path/output && df -t ext4 noprofile-container-path >> noprofile-container-path/output && sleep $SLEEP_DURATION
+        cmd: >
+               set -e -x
+               [ -n "{{{TEST_PROFILE_VOLUME_COMMAND}}}" ]
+               {{{TEST_PROFILE_VOLUME_COMMAND}}} pod-container-path
+               ! {{{TEST_PROFILE_VOLUME_COMMAND}}} noprofile-container-path
+               echo noprofile >> pod-container-path/output
+               echo noprofile >> noprofile-container-path/output
+               sleep $SLEEP_DURATION
         cpus: {{HELLO_CPUS}}
         memory: {{HELLO_MEM}}
         env:

diff --git a/frameworks/helloworld/tests/test_profile_mount_volumes.py b/frameworks/helloworld/tests/test_profile_mount_volumes.py
@@ -15,8 +15,13 @@ def configure_package(configure_security):
     try:
         sdk_install.uninstall(config.PACKAGE_NAME, config.SERVICE_NAME)
         options = {
-            "service": {"yaml": "pod-profile-mount-volume"},
-            "hello": {"volume_profile": "xfs"}  # hardcoded in `tools/create_testing_volumes.py`.
+            "service": {
+                "test_profile_volume_command": "df -t xfs",
+                "yaml": "pod-profile-mount-volume"
+            },
+            "hello": {
+                "volume_profile": "xfs"  # hardcoded in `tools/create_testing_volumes.py`.
+            }
         }
 
         sdk_install.install(config.PACKAGE_NAME, config.SERVICE_NAME, NUM_HELLO, additional_options=options)

diff --git a/frameworks/helloworld/universe/config.json b/frameworks/helloworld/universe/config.json
@@ -58,6 +58,11 @@
           "type": "boolean",
           "default": true
         },
+        "test_profile_volume_command": {
+          "description": "A shell command to test if a given path is on a profile volume, or empty for no test",
+          "type": "string",
+          "default": ""
+        },
         "scenario": {
           "description": "A comma-separated list of SDK customization scenarios to perform on the service(s)",
           "type": "string",

diff --git a/frameworks/helloworld/universe/marathon.json.mustache b/frameworks/helloworld/universe/marathon.json.mustache
@@ -102,6 +102,7 @@
     "KEYSTORE_APP_VERSION": "{{tls.keystore_app_version}}",
     "NGINX_CONTAINER_VERSION": "{{tls.nginx_container_version}}",
     "TEST_BOOLEAN": "{{service.test_boolean}}",
+    "TEST_PROFILE_VOLUME_COMMAND": "{{{service.test_profile_volume_command}}}",
     "SCENARIOS": "{{service.scenario}}",
     "ALLOW_REGION_AWARENESS": "{{service.allow_region_awareness}}",
     "HELLO_PORT_ONE": "{{hello.port_one}}",