Merge ~sylvain-pineau/checkbox-provider-edgex:multi-release-layout into ~checkbox-dev/checkbox-provider-edgex:master

[Sylvain Pineau]

Adopt a multi release layout instead of managing multiple branches/versions/tracks of the same snap. This is a working model inspired by what we've been using for the tpm2 provider [1].

Both Fuji and Geneva tests and test plan are coexisting and scripts have been transferred to the data/ dir.

New launchers are available for the two releases and the existing test-runner now loads the geneva test plan.

[1] https://git.launchpad.net/plainbox-provider-tpm2/tree/data

[Sylvain Pineau (sylvain-pineau)]

Geneva test cases have been taken from https://code.launchpad.net/~awe/checkbox-provider-edgex/+git/checkbox-provider-edgex/+merge/382543

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

diff --git a/bin/run-all-tests-locally.sh b/data/fuji/run-all-tests-locally.sh
similarity index 100%
rename from bin/run-all-tests-locally.sh
rename to data/fuji/run-all-tests-locally.sh
diff --git a/bin/test-dbtype-mongo.sh b/data/fuji/test-dbtype-mongo.sh
similarity index 100%
rename from bin/test-dbtype-mongo.sh
rename to data/fuji/test-dbtype-mongo.sh
diff --git a/bin/test-dbtype-redis.sh b/data/fuji/test-dbtype-redis.sh
similarity index 100%
rename from bin/test-dbtype-redis.sh
rename to data/fuji/test-dbtype-redis.sh
diff --git a/bin/test-device-random.sh b/data/fuji/test-device-random.sh
similarity index 100%
rename from bin/test-device-random.sh
rename to data/fuji/test-device-random.sh
diff --git a/bin/test-device-virtual.sh b/data/fuji/test-device-virtual.sh
similarity index 100%
rename from bin/test-device-virtual.sh
rename to data/fuji/test-device-virtual.sh
diff --git a/bin/test-install-config-paths.sh b/data/fuji/test-install-config-paths.sh
similarity index 100%
rename from bin/test-install-config-paths.sh
rename to data/fuji/test-install-config-paths.sh
diff --git a/bin/test-install.sh b/data/fuji/test-install.sh
similarity index 100%
rename from bin/test-install.sh
rename to data/fuji/test-install.sh
diff --git a/bin/test-push-config.sh b/data/fuji/test-push-config.sh
similarity index 100%
rename from bin/test-push-config.sh
rename to data/fuji/test-push-config.sh
diff --git a/bin/test-refresh-config-paths.sh b/data/fuji/test-refresh-config-paths.sh
similarity index 100%
rename from bin/test-refresh-config-paths.sh
rename to data/fuji/test-refresh-config-paths.sh
diff --git a/bin/test-refresh-services.sh b/data/fuji/test-refresh-services.sh
similarity index 100%
rename from bin/test-refresh-services.sh
rename to data/fuji/test-refresh-services.sh
diff --git a/bin/test-security-services-proxy-certs.sh b/data/fuji/test-security-services-proxy-certs.sh
similarity index 100%
rename from bin/test-security-services-proxy-certs.sh
rename to data/fuji/test-security-services-proxy-certs.sh
diff --git a/bin/test-self-refresh-services.sh b/data/fuji/test-self-refresh-services.sh
similarity index 100%
rename from bin/test-self-refresh-services.sh
rename to data/fuji/test-self-refresh-services.sh
diff --git a/bin/test-services-alive.sh b/data/fuji/test-services-alive.sh
similarity index 100%
rename from bin/test-services-alive.sh
rename to data/fuji/test-services-alive.sh
diff --git a/bin/test-sys-mgmt-agent.sh b/data/fuji/test-sys-mgmt-agent.sh
similarity index 100%
rename from bin/test-sys-mgmt-agent.sh
rename to data/fuji/test-sys-mgmt-agent.sh
diff --git a/bin/utils.sh b/data/fuji/utils.sh
similarity index 100%
rename from bin/utils.sh
rename to data/fuji/utils.sh
diff --git a/data/geneva/run-all-tests-locally.sh b/data/geneva/run-all-tests-locally.sh
new file mode 100755
index 0000000..e297db1
--- /dev/null
+++ b/data/geneva/run-all-tests-locally.sh
@@ -0,0 +1,154 @@
+#!/bin/bash -e
+
+# get the directory of this script
+# snippet from https://stackoverflow.com/a/246128/10102404
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+if [ "$(id -u)" != "0" ]; then
+    echo "script must be run as root"
+    exit 1
+fi
+
+# load the utils
+# shellcheck source=/dev/null
+source "$SCRIPT_DIR/utils.sh"
+
+# helper function to download the snap, ack the assertion and return the
+# name of the file
+snap_download_and_ack()
+{
+    # download the snap and grep the output for the assert file so we can ack 
+    # it
+    snap_download_output=$(snap download "$1" "$2")
+    $SUDO snap ack "$(echo "$snap_download_output" | grep -Po 'edgexfoundry_[0-9]+\.assert')"
+    # return the name of this snap
+    echo "$(pwd)"/"$(echo "$snap_download_output" | grep -Po 'edgexfoundry_[0-9]+\.snap')"
+}
+
+snap_download_stable_and_last()
+{
+    # download and ack the stable and edinburgh channels as we have tests to ensure
+    # there's a smooth upgrade between those channels and this one that is
+    # under consideration
+    # this also saves in download bandwidth and time
+    EDGEX_STABLE_SNAP_FILE=$(snap_download_and_ack edgexfoundry --stable)
+    EDGEX_EDINBURGH_SNAP_FILE=$(snap_download_and_ack edgexfoundry --channel=edinburgh)
+
+    # export the names of the stable and delhi snap files
+    export EDGEX_STABLE_SNAP_FILE
+    export EDGEX_EDINBURGH_SNAP_FILE
+}
+
+# parse arguments - adapted from https://stackoverflow.com/a/14203146/10102404
+POSITIONAL=()
+while [[ $# -gt 0 ]]; do
+    key="$1"
+    case $key in
+        -h|--help)
+            echo "usage:"
+            echo "run-all-tests-locally.sh [OPTIONS]"
+            echo "options:"
+            printf -- "-s|--snap SNAP\t local snap file to test\n"
+            printf -- "-t|--test TEST\t run single test\n"
+            printf -- "-v|--verbose\t show output of tests even if passed\n"
+            printf -- "-i|--ignorefail\t continue running tests even if some fail\n"
+            exit 0
+            ;;
+        -s|--snap)
+            LOCAL_SNAP="$2"
+            shift # past argument
+            shift # past value
+            ;;
+        -t|--test)
+            SINGLE_TEST="$2"
+            shift # past argument
+            shift # past value
+            ;;
+        -v|--verbose)
+            VERBOSE=YES
+            shift # past argument
+            ;;
+        -i|--ignorefail)
+            IGNORE_FAIL=YES
+            shift # past argument
+            ;;
+        *)    # unknown option
+            POSITIONAL+=("$1") # save it in an array for later
+            shift # past argument
+            ;;
+    esac
+done
+set -- "${POSITIONAL[@]}" # restore positional parameters
+
+# if an argument was provided to the script, it's supposed to be a local snap
+# file to test - confirm that the file exists
+# otherwise if we didn't get any arguments assume to test the snap from beta
+if [[ -n $LOCAL_SNAP ]]; then
+    if [ -f "$LOCAL_SNAP" ]; then
+        echo "testing local snap: $LOCAL_SNAP"
+        REVISION_TO_TEST=$LOCAL_SNAP
+        REVISION_TO_TEST_CHANNEL=""
+        # for now always need to test edgexfoundry locally with devmode
+        # because we can't auto-connect interfaces that are needed
+        REVISION_TO_TEST_CONFINEMENT="--devmode"
+    else
+        echo "local snap to test: \"$LOCAL_SNAP\" does not exist"
+        exit 1
+    fi
+else 
+    REVISION_TO_TEST=$(snap_download_and_ack edgexfoundry --beta)
+    REVISION_TO_TEST_CHANNEL=""
+    REVISION_TO_TEST_CONFINEMENT=""
+fi
+
+# export the revision to test env vars
+export REVISION_TO_TEST
+export REVISION_TO_TEST_CHANNEL
+export REVISION_TO_TEST_CONFINEMENT
+
+# make sure to remove the snap if it's installed before running
+snap_remove 2>/dev/null > /dev/null
+
+set +e
+if [ -n "$SINGLE_TEST" ]; then
+    printf "running single test: %s ..." "$SINGLE_TEST"
+
+    if [ "$SINGLE_TEST" == "test-refresh-config-paths.sh" ] ||
+       [ "$SINGLE_TEST" == "test-refresh-services.sh" ]; then
+        snap_download_stable_and_last
+    fi
+
+    if stdout="$("$SCRIPT_DIR/$SINGLE_TEST" 2>&1)"; then
+        printf -- "\tPASSED\n"
+        if [ -n "$VERBOSE" ]; then
+            echo "$stdout"
+        fi
+    else
+        printf -- "\tFAILED:\n"
+        echo "$stdout"
+        exit 1
+    fi
+else
+    snap_download_stable_and_last
+
+    # run all the tests (except this file obviously)
+    for file in "$SCRIPT_DIR"/test-*.sh; do 
+        printf "running test: %s..." "$file"
+        if stdout="$($file 2>&1)"; then
+            printf "\t\tPASSED\n"
+            if [ -n "$VERBOSE" ]; then
+                echo "$stdout"
+            fi
+        else
+            printf "\t\tFAILED:\n"
+            echo "$stdout"
+            if [ -z "$IGNORE_FAIL" ]; then
+                snap_remove
+                exit 1
+            fi
+        fi
+    done
+fi
+
+# finally remove the snap if it's still there
+snap_remove 2>/dev/null > /dev/null
diff --git a/data/geneva/test-dbtype-mongo.sh b/data/geneva/test-dbtype-mongo.sh
new file mode 100755
index 0000000..1775815
--- /dev/null
+++ b/data/geneva/test-dbtype-mongo.sh
@@ -0,0 +1,98 @@
+#!/bin/bash -e
+
+# get the directory of this script
+# snippet from https://stackoverflow.com/a/246128/10102404
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+# load the utils
+# shellcheck source=/dev/null
+source "$SCRIPT_DIR/utils.sh"
+
+DEFAULT_TEST_CHANNEL=${DEFAULT_TEST_CHANNEL:-beta}
+
+snap_remove
+
+# install the snap to make sure it installs
+if [ -n "$REVISION_TO_TEST" ]; then
+    snap_install "$REVISION_TO_TEST" "$REVISION_TO_TEST_CHANNEL" "$REVISION_TO_TEST_CONFINEMENT"
+else
+    snap_install edgexfoundry "$DEFAULT_TEST_CHANNEL"  
+fi
+
+echo -n "finding jq... "
+
+set +e
+if command -v edgexfoundry.jq > /dev/null; then
+    JQ=$(command -v edgexfoundry.jq)
+elif command -v jq > /dev/null; then
+    JQ=$(command -v jq)
+else
+    echo "NOT FOUND"
+    echo "install with snap install jq"
+    exit 1
+fi
+
+echo "found at $JQ"
+
+echo -n "finding toml2json... "
+
+set +e
+if ! command -v toml2json > /dev/null; then
+    echo "NOT FOUND"
+    echo "install with \`snap install remarshal\`"
+    exit 1
+fi
+
+echo "found at $(command -v toml2json)"
+
+# wait for services to start up
+sleep 120
+
+# set to redis, assume that this change works, it's tested already elsewhere
+snap set edgexfoundry dbtype=redis
+sleep 15
+
+# set back to mongo now
+snap set edgexfoundry dbtype=mongodb
+sleep 15
+
+# check that the config files use mongo now
+for svc in core-data core-metadata export-client support-notifications support-scheduler; do
+    # the type should be mongodb
+    if [ "$(toml2json < "/var/snap/edgexfoundry/current/config/$svc/res/configuration.toml" | jq -r '.Databases.Primary.Type')" != "mongodb" ]; then
+        echo "incorrect setting for $svc primary database type after changing to mongo"
+        exit 1
+    fi
+    # the port should be 27017
+    if [ "$(toml2json < "/var/snap/edgexfoundry/current/config/$svc/res/configuration.toml" | jq -r '.Databases.Primary.Port')" != "27017" ]; then
+        echo "incorrect setting for $svc primary database port after changing to mongo"
+        exit 1
+    fi
+done
+
+# ensure mongod is running
+if [ -n "$(snap services edgexfoundry.mongod | grep edgexfoundry.mongod | grep inactive)" ]; then
+    echo "mongod is not running after changing to mongo"
+    exit 1
+fi
+
+# ensure mongod is enabled
+if [ -z "$(snap services edgexfoundry.mongod | grep edgexfoundry.mongod | grep enabled)" ]; then
+    echo "mongod is not enabled after changing to mongo"
+    exit 1
+fi
+
+# ensure redis is not running
+if [ -z "$(snap services edgexfoundry.redis | grep edgexfoundry.redis | grep inactive)" ]; then
+    echo "redis is running after changing to mongo"
+    exit 1
+fi
+
+# ensure redis is disabled
+if [ -z "$(snap services edgexfoundry.redis | grep edgexfoundry.redis | grep disabled)" ]; then
+    echo "redis is enabled after changing to mongo"
+    exit 1
+fi
+
+# remove the snap to run again
+snap_remove
diff --git a/data/geneva/test-dbtype-redis.sh b/data/geneva/test-dbtype-redis.sh
new file mode 100755
index 0000000..a1b522e
--- /dev/null
+++ b/data/geneva/test-dbtype-redis.sh
@@ -0,0 +1,140 @@
+#!/bin/bash -e
+
+# get the directory of this script
+# snippet from https://stackoverflow.com/a/246128/10102404
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+# load the utils
+# shellcheck source=/dev/null
+source "$SCRIPT_DIR/utils.sh"
+
+DEFAULT_TEST_CHANNEL=${DEFAULT_TEST_CHANNEL:-beta}
+
+snap_remove
+
+# install the snap to make sure it installs
+if [ -n "$REVISION_TO_TEST" ]; then
+    snap_install "$REVISION_TO_TEST" "$REVISION_TO_TEST_CHANNEL" "$REVISION_TO_TEST_CONFINEMENT"
+else
+    snap_install edgexfoundry "$DEFAULT_TEST_CHANNEL"  
+fi
+
+echo -n "finding jq... "
+
+set +e
+if command -v edgexfoundry.jq > /dev/null; then
+    JQ=$(command -v edgexfoundry.jq)
+elif command -v jq > /dev/null; then
+    JQ=$(command -v jq)
+else
+    echo "NOT FOUND"
+    echo "install with snap install jq"
+    exit 1
+fi
+
+echo "found at $JQ"
+
+echo -n "finding toml2json... "
+
+set +e
+if ! command -v toml2json > /dev/null; then
+    echo "NOT FOUND"
+    echo "install with \`snap install remarshal\`"
+    exit 1
+fi
+
+echo "found at $(command -v toml2json)"
+
+# wait for services to start up
+sleep 120
+
+# check that the config files use mongo currently
+for svc in core-data core-metadata export-client support-notifications support-scheduler; do
+    # the type should be mongodb
+    if [ "$(toml2json < "/var/snap/edgexfoundry/current/config/$svc/res/configuration.toml" | jq -r '.Databases.Primary.Type')" != "mongodb" ]; then
+        echo "incorrect initial setting for $svc primary database type"
+        exit 1
+    fi
+    # the port should be 27017
+    if [ "$(toml2json < "/var/snap/edgexfoundry/current/config/$svc/res/configuration.toml" | jq -r '.Databases.Primary.Port')" != "27017" ]; then
+        echo "incorrect initial setting for $svc primary database port"
+        exit 1
+    fi
+done
+
+# ensure mongod is running
+if [ -n "$(snap services edgexfoundry.mongod | grep edgexfoundry.mongod | grep inactive)" ]; then
+    echo "mongod is not running initially"
+    exit 1
+fi
+
+# ensure mongod is enabled
+if [ -z "$(snap services edgexfoundry.mongod | grep edgexfoundry.mongod | grep enabled)" ]; then
+    echo "mongod is not enabled initially"
+    exit 1
+fi
+
+# ensure redis is not running
+if [ -z "$(snap services edgexfoundry.redis | grep edgexfoundry.redis | grep inactive)" ]; then
+    echo "redis is running initially"
+    exit 1
+fi
+
+# ensure redis is disabled
+if [ -z "$(snap services edgexfoundry.redis | grep edgexfoundry.redis | grep disabled)" ]; then
+    echo "redis is enabled intially"
+    exit 1
+fi
+
+# set the dbtype
+snap set edgexfoundry dbtype=redis
+
+# wait for services to start/restart
+sleep 15
+
+# ensure mongod isn't running
+if [ -z "$(snap services edgexfoundry.mongod | grep edgexfoundry.mongod | grep inactive)" ]; then
+    echo "mongod is still running after changing to redis"
+    exit 1
+fi
+
+# ensure mongod is disabled
+if [ -z "$(snap services edgexfoundry.mongod | grep edgexfoundry.mongod | grep disabled)" ]; then
+    echo "mongod is still enabled after changing to redis"
+    exit 1
+fi
+
+# ensure redis is now running
+if [ -n "$(snap services edgexfoundry.redis | grep edgexfoundry.redis | grep inactive)" ]; then
+    echo "redis is not running after changing to redis"
+    exit 1
+fi
+
+# ensure redis is enabled
+if [ -z "$(snap services edgexfoundry.redis | grep edgexfoundry.redis | grep enabled)" ]; then
+    echo "redis is not enabled after changing to redis"
+    exit 1
+fi
+
+# check that the config files now use redis currently
+for svc in core-data core-metadata export-client support-notifications support-scheduler; do
+    # the type should be redisdb
+    if [ "$(toml2json < "/var/snap/edgexfoundry/current/config/$svc/res/configuration.toml" | jq -r '.Databases.Primary.Type')" != "redisdb" ]; then
+        echo "incorrect changed setting for $svc primary database type"
+        exit 1
+    fi
+    # the port should be 6379
+    if [ "$(toml2json < "/var/snap/edgexfoundry/current/config/$svc/res/configuration.toml" | jq -r '.Databases.Primary.Port')" != "6379" ]; then
+        echo "incorrect changed setting for $svc primary database port"
+        exit 1
+    fi
+done
+
+# support-logging should now have file persistence
+if [ "$(toml2json < "/var/snap/edgexfoundry/current/config/support-logging/res/configuration.toml" | jq -r '.Writable.Persistence')" != "file" ]; then
+    echo "incorrect initial setting for support-logging persistence mechanism"
+    exit 1
+fi
+
+# remove the snap to run again
+snap_remove
diff --git a/data/geneva/test-device-virtual.sh b/data/geneva/test-device-virtual.sh
new file mode 100755
index 0000000..6251d8d
--- /dev/null
+++ b/data/geneva/test-device-virtual.sh
@@ -0,0 +1,104 @@
+#!/bin/bash -e
+
+# get the directory of this script
+# snippet from https://stackoverflow.com/a/246128/10102404
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+# load the utils
+# shellcheck source=/dev/null
+source "$SCRIPT_DIR/utils.sh"
+
+DEFAULT_TEST_CHANNEL=${DEFAULT_TEST_CHANNEL:-beta}
+
+snap_remove
+
+# install the snap to make sure it installs
+if [ -n "$REVISION_TO_TEST" ]; then
+    snap_install "$REVISION_TO_TEST" "$REVISION_TO_TEST_CHANNEL" "$REVISION_TO_TEST_CONFINEMENT"
+else
+    snap_install edgexfoundry "$DEFAULT_TEST_CHANNEL"  
+fi
+
+# wait for services to come online
+# NOTE: this may have to be significantly increased on arm64 or low RAM platforms
+# to accomodate time for everything to come online
+sleep 120
+
+# start device-virtual
+snap start edgexfoundry.device-virtual
+
+# wait 10 seconds - check to make sure it's still running
+sleep 10
+if [ -n "$(snap services edgexfoundry.device-virtual | grep edgexfoundry.device-virtual | grep inactive)" ]; then
+    echo "failed to start device-virtual"
+    exit 1
+fi
+
+echo -n "finding jq... "
+
+set +e
+if command -v edgexfoundry.jq > /dev/null; then
+    JQ=$(command -v edgexfoundry.jq)
+elif command -v jq > /dev/null; then
+    JQ=$(command -v jq)
+else
+    echo "NOT FOUND"
+    echo "install with \`snap install jq\`"
+    exit 1
+fi
+
+echo "found at $JQ"
+
+# a new try every other second, at max 30 tries is 1 minute for device-virtual
+# to start
+MAX_READING_TRIES=30
+num_tries=0
+
+# check to see if we can find the device created by device-virtual
+while true; do
+    if ! (edgexfoundry.curl -s localhost:48081/api/v1/device | $JQ '.'); then
+        # not json - something's wrong
+        echo "invalid JSON response from core-metadata"
+        exit 1
+    elif [ "$(edgexfoundry.curl -s localhost:48081/api/v1/device | $JQ 'map(select(.name == "Random-Boolean-Device")) | length')" -lt 1 ]; then
+        # increment number of tries
+        num_tries=$((num_tries+1))
+        if (( num_tries > MAX_READING_TRIES )); then
+            echo "max tries attempting to get device-virtual readings"
+            exit 1
+        fi
+        # no readings yet, keep waiting
+        sleep 2
+    else
+        # got the device, break out
+        break
+    fi
+done
+
+# reset the number of tries
+num_tries=0
+
+# check to see if we can get a reading from the Random-Boolean-Device
+while true; do
+    if ! (edgexfoundry.curl -s localhost:48080/api/v1/reading/device/Random-Boolean-Device/10 | $JQ '.'); then
+        # not json - something's wrong
+        echo "invalid JSON response from core-data"
+        exit 1
+    elif [ "$(edgexfoundry.curl -s localhost:48080/api/v1/reading/device/Random-Boolean-Device/10 | $JQ 'length')" -le 1 ]; then
+        # increment number of tries
+        num_tries=$((num_tries+1))
+        if (( num_tries > MAX_READING_TRIES )); then
+            echo "max tries attempting to get device-virtual readings"
+            exit 1
+        fi
+        # no readings yet, keep waiting
+        sleep 2
+    else
+        # got at least one reading, break out
+        break
+    fi
+done
+set -e
+
+# remove the snap to run the next test
+snap_remove
diff --git a/data/geneva/test-install-config-paths.sh b/data/geneva/test-install-config-paths.sh
new file mode 100755
index 0000000..dc5604f
--- /dev/null
+++ b/data/geneva/test-install-config-paths.sh
@@ -0,0 +1,49 @@
+#!/bin/bash -e
+
+# get the directory of this script
+# snippet from https://stackoverflow.com/a/246128/10102404
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+# load the utils
+# shellcheck source=/dev/null
+source "$SCRIPT_DIR/utils.sh"
+
+DEFAULT_TEST_CHANNEL=${DEFAULT_TEST_CHANNEL:-beta}
+
+snap_remove
+
+# now install the snap version we are testing and check again
+if [ -n "$REVISION_TO_TEST" ]; then
+    snap_install "$REVISION_TO_TEST" "$REVISION_TO_TEST_CHANNEL" "$REVISION_TO_TEST_CONFINEMENT"
+else
+    snap_install edgexfoundry "$DEFAULT_TEST_CHANNEL"  
+fi
+
+# get the revision number for this channel
+SNAP_REVISION=$(snap run --shell edgexfoundry.consul -c "echo \$SNAP_REVISION")
+
+# wait for services to come online
+# NOTE: this may have to be significantly increased on arm64 or low RAM platforms
+# to accomodate time for everything to come online
+sleep 120
+
+echo "checking for files with snap revision $SNAP_REVISION"
+
+# check that all files in $SNAP_DATA don't reference the previous revision
+# except for binary files, cassandra log files, and an errant comment I 
+# put in the vault hcl file which the install hook from previous revisions
+# also ends up putting the path including the old revision number inside
+cd /var/snap/edgexfoundry/current
+set +e
+notUpgradedFiles=$(grep -R "edgexfoundry/$SNAP_REVISION" | \
+    grep -v "Binary file" | \
+    grep -v "postmaster" | \
+    grep -v "and the location of the files uses reference")
+if [ -n "$notUpgradedFiles" ]; then
+    echo "files not upgraded to use \"current\" symlink in config files:"
+    echo "$notUpgradedFiles"
+    exit 1
+fi
+set -e
+
+snap_remove
diff --git a/data/geneva/test-install.sh b/data/geneva/test-install.sh
new file mode 100755
index 0000000..8b7fbe4
--- /dev/null
+++ b/data/geneva/test-install.sh
@@ -0,0 +1,23 @@
+#!/bin/bash -e
+
+# get the directory of this script
+# snippet from https://stackoverflow.com/a/246128/10102404
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+# load the utils
+# shellcheck source=/dev/null
+source "$SCRIPT_DIR/utils.sh"
+
+snap_remove
+
+DEFAULT_TEST_CHANNEL=${DEFAULT_TEST_CHANNEL:-beta}
+
+# install the snap to make sure it installs
+if [ -n "$REVISION_TO_TEST" ]; then
+    snap_install "$REVISION_TO_TEST" "$REVISION_TO_TEST_CHANNEL" "$REVISION_TO_TEST_CONFINEMENT"
+else
+    snap_install edgexfoundry "$DEFAULT_TEST_CHANNEL" 
+fi
+
+# remove the snap to run again
+snap_remove
diff --git a/data/geneva/test-refresh-config-paths.sh b/data/geneva/test-refresh-config-paths.sh
new file mode 100755
index 0000000..55d1202
--- /dev/null
+++ b/data/geneva/test-refresh-config-paths.sh
@@ -0,0 +1,87 @@
+#!/bin/bash -e
+
+# get the directory of this script
+# snippet from https://stackoverflow.com/a/246128/10102404
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+# load the utils
+# shellcheck source=/dev/null
+source "$SCRIPT_DIR/utils.sh"
+
+DEFAULT_TEST_CHANNEL=${DEFAULT_TEST_CHANNEL:-beta}
+
+snap_remove
+
+echo "skipping test until snap with epoch 1 is released to edge"
+exit 0
+
+for channel in edge; do 
+    # first make sure that the snap installs correctly from the channel
+    case "$channel" in 
+        delhi)
+            echo "installing delhi channel snap"
+            if [ -n "$EDGEX_EDINBURGH_SNAP_FILE" ]; then
+                snap_install "$EDGEX_EDINBURGH_SNAP_FILE"
+            else
+                snap_install edgexfoundry edinburgh
+            fi
+            ;;
+        stable)
+            echo "installing stable channel snap"
+            if [ -n "$EDGEX_STABLE_SNAP_FILE" ]; then
+                snap_install "$EDGEX_STABLE_SNAP_FILE"
+            else
+                snap_install edgexfoundry stable
+            fi
+            ;;
+        *)
+            echo "installing $channel channel snap"
+            snap_install edgexfoundry "$channel"
+            ;;
+    esac
+
+    # get the revision number for this channel
+    SNAP_REVISION=$(snap run --shell edgexfoundry.consul -c "echo \$SNAP_REVISION")
+    
+    # wait for services to come online
+    # NOTE: this may have to be significantly increased on arm64 or low RAM platforms
+    # to accomodate time for everything to come online
+    sleep 120
+
+    # now install the snap version we are testing and check again
+    if [ -n "$REVISION_TO_TEST" ]; then
+        snap_install "$REVISION_TO_TEST" "$REVISION_TO_TEST_CHANNEL" "$REVISION_TO_TEST_CONFINEMENT"
+    else
+        snap_refresh edgexfoundry "$DEFAULT_TEST_CHANNEL"  
+    fi
+
+    # wait for services to come online
+    # NOTE: this may have to be significantly increased on arm64 or low RAM platforms
+    # to accomodate time for everything to come online
+    sleep 120
+
+    echo "checking for files with previous snap revision $SNAP_REVISION"
+
+    # check that all files in $SNAP_DATA don't reference the previous revision
+    # except for binary files, cassandra log files, and an errant comment I 
+    # put in the vault hcl file which the install hook from previous revisions
+    # also ends up putting the path including the old revision number inside
+    pushd /var/snap/edgexfoundry/current > /dev/null
+    set +e
+    notUpgradedFiles=$(grep -R "edgexfoundry/$SNAP_REVISION" | \
+        grep -v "Binary file" | \
+        grep -v "cassandra/logs" | \
+        grep -v "and the location of the files uses reference")
+    popd > /dev/null
+    if [ -n "$notUpgradedFiles" ]; then
+        echo "files not upgraded to use \"current\" symlink in config files:"
+        echo "$notUpgradedFiles"
+        exit 1
+    fi
+    set -e
+
+    echo "removing $channel snap"
+
+    # remove the snap to run the next channel upgrade
+    snap_remove
+done
diff --git a/data/geneva/test-refresh-services.sh b/data/geneva/test-refresh-services.sh
new file mode 100755
index 0000000..5b598ca
--- /dev/null
+++ b/data/geneva/test-refresh-services.sh
@@ -0,0 +1,61 @@
+#!/bin/bash -e
+
+# get the directory of this script
+# snippet from https://stackoverflow.com/a/246128/10102404
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+# load the utils
+# shellcheck source=/dev/null
+source "$SCRIPT_DIR/utils.sh"
+
+DEFAULT_TEST_CHANNEL=${DEFAULT_TEST_CHANNEL:-beta}
+
+snap_remove
+
+echo "skipping test until snap with epoch 1 is released to edge"
+exit 0
+
+for channel in edge; do 
+    # first make sure that the snap installs correctly from the channel
+    # use locally cached version of stable and delhi
+    case "$channel" in 
+        delhi)
+            if [ -n "$EDGEX_EDINBURGH_SNAP_FILE" ]; then
+                snap_install "$EDGEX_EDINBURGH_SNAP_FILE"
+            else
+                snap_install edgexfoundry edinburgh
+            fi
+            ;;
+        stable)
+            if [ -n "$EDGEX_STABLE_SNAP_FILE" ]; then
+                snap_install "$EDGEX_STABLE_SNAP_FILE"
+            else
+                snap_install edgexfoundry stable
+            fi
+            ;;
+        *)
+            snap_install edgexfoundry "$channel"
+            ;;
+    esac
+    # wait for services to come online
+    # NOTE: this may have to be significantly increased on arm64 or low RAM platforms
+    # to accomodate time for everything to come online
+    sleep 120
+    snap_check_geneva_svcs
+
+    # now install the snap version we are testing and check again
+    if [ -n "$REVISION_TO_TEST" ]; then
+        snap_install "$REVISION_TO_TEST" "$REVISION_TO_TEST_CHANNEL" "$REVISION_TO_TEST_CONFINEMENT"
+    else
+        snap_refresh edgexfoundry "$DEFAULT_TEST_CHANNEL"  
+    fi
+    # wait for services to come online
+    # NOTE: this may have to be significantly increased on arm64 or low RAM platforms
+    # to accomodate time for everything to come online
+    sleep 120
+
+    snap_check_genava_svcs --notfatal
+
+    # remove the snap to run the next channel upgrade
+    snap_remove
+done
diff --git a/data/geneva/test-security-services-proxy-certs.sh b/data/geneva/test-security-services-proxy-certs.sh
new file mode 100755
index 0000000..bdc3bec
--- /dev/null
+++ b/data/geneva/test-security-services-proxy-certs.sh
@@ -0,0 +1,46 @@
+#!/bin/bash -e
+
+# get the directory of this script
+# snippet from https://stackoverflow.com/a/246128/10102404
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+# load the utils
+# shellcheck source=/dev/null
+source "$SCRIPT_DIR/utils.sh"
+
+DEFAULT_TEST_CHANNEL=${DEFAULT_TEST_CHANNEL:-beta}
+
+snap_remove
+
+# install the snap to make sure it installs
+if [ -n "$REVISION_TO_TEST" ]; then
+    snap_install "$REVISION_TO_TEST" "$REVISION_TO_TEST_CHANNEL" "$REVISION_TO_TEST_CONFINEMENT"
+else
+    snap_install edgexfoundry "$DEFAULT_TEST_CHANNEL" 
+fi
+
+# wait for services to come online
+# NOTE: this may have to be significantly increased on arm64 or low RAM platforms
+# to accomodate time for everything to come online
+sleep 240
+
+# copy the root certificate to confirm that can be used to authenticate the
+# kong server
+cp /var/snap/edgexfoundry/current/pki/EdgeXFoundryCA/EdgeXFoundryCA.pem /var/snap/edgexfoundry/current/EdgeXFoundryCA.pem
+
+# make the CA world-readable
+chmod +r /var/snap/edgexfoundry/current/EdgeXFoundryCA.pem
+
+# use curl to talk to the kong admin endpoint with the cert
+edgexfoundry.curl --cacert /var/snap/edgexfoundry/current/EdgeXFoundryCA.pem https://localhost:8443/command > /dev/null
+
+# restart all of EdgeX (including the security-services) and make sure the 
+# same certificate still works
+snap disable edgexfoundry > /dev/null
+snap enable edgexfoundry > /dev/null
+
+sleep 240
+edgexfoundry.curl --cacert /var/snap/edgexfoundry/current/EdgeXFoundryCA.pem https://localhost:8443/command > /dev/null
+
+# remove the snap to run the next test
+snap_remove
diff --git a/data/geneva/test-self-refresh-services.sh b/data/geneva/test-self-refresh-services.sh
new file mode 100755
index 0000000..fb628ab
--- /dev/null
+++ b/data/geneva/test-self-refresh-services.sh
@@ -0,0 +1,56 @@
+#!/bin/bash -e
+
+# get the directory of this script
+# snippet from https://stackoverflow.com/a/246128/10102404
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+# load the utils
+# shellcheck source=/dev/null
+source "$SCRIPT_DIR/utils.sh"
+
+# remove the snap if it's already installed
+DEFAULT_TEST_CHANNEL=${DEFAULT_TEST_CHANNEL:-beta}
+
+snap_remove
+
+# install the snap version we are testing
+if [ -n "$REVISION_TO_TEST" ]; then
+    snap_install "$REVISION_TO_TEST" "$REVISION_TO_TEST_CHANNEL" "$REVISION_TO_TEST_CONFINEMENT"
+else
+    snap_install edgexfoundry "$DEFAULT_TEST_CHANNEL" 
+fi
+
+# wait for services to come online
+# NOTE: this may have to be significantly increased on arm64 or low RAM platforms
+# to accomodate time for everything to come online
+sleep 120
+
+# now install the same snap version we are testing to test the pre-refresh
+# and post-refresh logic in this revision
+if [ -n "$REVISION_TO_TEST" ]; then
+    snap_install "$REVISION_TO_TEST" "$REVISION_TO_TEST_CHANNEL" "$REVISION_TO_TEST_CONFINEMENT"
+else
+    # if we aren't running locally, then we need to download the revision and
+    # install it locally as if it was a different revision
+    snap_download_output=$(snap download edgexfoundry --channel="$DEFAULT_TEST_CHANNEL")
+    THIS_REVISION_LOCALLY="$(pwd)/$(echo "$snap_download_output" | grep -Po 'edgexfoundry_[0-9]+\.snap')"
+    snap_install "$THIS_REVISION_LOCALLY" "" "--devmode"
+fi
+
+# wait for services to come online
+# NOTE: this may have to be significantly increased on arm64 or low RAM platforms
+# to accomodate time for everything to come online
+sleep 120
+
+# ignore failures for now due to https://bugs.launchpad.net/snapd/+bug/1818306
+snap_check_geneva_svcs --notfatal
+
+# ensure the release config item is set to fuji
+snapRelease=$(snap get edgexfoundry release)
+if [ "$snapRelease" != "geneva" ]; then
+    echo "missing or invalid config item for snap release: \"$snapRelease\""
+    snap_remove
+    exit 1
+fi
+
+snap_remove
diff --git a/data/geneva/test-services-alive.sh b/data/geneva/test-services-alive.sh
new file mode 100755
index 0000000..b2a7959
--- /dev/null
+++ b/data/geneva/test-services-alive.sh
@@ -0,0 +1,32 @@
+#!/bin/bash -e
+
+# get the directory of this script
+# snippet from https://stackoverflow.com/a/246128/10102404
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+# load the utils
+# shellcheck source=/dev/null
+source "$SCRIPT_DIR/utils.sh"
+
+DEFAULT_TEST_CHANNEL=${DEFAULT_TEST_CHANNEL:-beta}
+
+snap_remove
+
+# install the snap to make sure it installs
+if [ -n "$REVISION_TO_TEST" ]; then
+    snap_install "$REVISION_TO_TEST" "$REVISION_TO_TEST_CHANNEL" "$REVISION_TO_TEST_CONFINEMENT"
+else
+    snap_install edgexfoundry "$DEFAULT_TEST_CHANNEL"  
+fi
+
+# wait for services to come online
+# NOTE: this may have to be significantly increased on arm64 or low RAM platforms
+# to accomodate time for everything to come online
+sleep 120
+
+# check services
+# ignore failures for now due to https://bugs.launchpad.net/snapd/+bug/1818306
+snap_check_geneva_svcs
+
+# remove the snap to run the next test
+snap_remove
diff --git a/data/geneva/test-sys-mgmt-agent.sh b/data/geneva/test-sys-mgmt-agent.sh
new file mode 100755
index 0000000..a852663
--- /dev/null
+++ b/data/geneva/test-sys-mgmt-agent.sh
@@ -0,0 +1,84 @@
+#!/bin/bash -e
+
+# get the directory of this script
+# snippet from https://stackoverflow.com/a/246128/10102404
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+# load the utils
+# shellcheck source=/dev/null
+source "$SCRIPT_DIR/utils.sh"
+
+DEFAULT_TEST_CHANNEL=${DEFAULT_TEST_CHANNEL:-beta}
+
+snap_remove
+
+# now install the snap version we are testing and check again
+if [ -n "$REVISION_TO_TEST" ]; then
+    snap_install "$REVISION_TO_TEST" "$REVISION_TO_TEST_CHANNEL" "$REVISION_TO_TEST_CONFINEMENT"
+else
+    snap_install edgexfoundry "$DEFAULT_TEST_CHANNEL"  
+fi
+
+# wait for services to come online
+# NOTE: this may have to be significantly increased on arm64 or low RAM platforms
+# to accomodate time for everything to come online
+sleep 120
+
+# make sure that core-data is running
+if [ -n "$(snap services edgexfoundry.core-data | grep edgexfoundry.core-data | grep inactive)" ]; then
+    echo "core-data is not running"
+    snap_remove
+    exit 1
+fi
+
+# issue a stop command to the SMA for core-data
+edgexfoundry.curl \
+    --fail \
+    --header "Content-Type: application/json" \
+    --request POST \
+    --data '{"action":"stop","services":["edgex-core-data"]}' \
+    localhost:48090/api/v1/operation
+
+# check that core-data is no longer running
+if [ -z "$(snap services edgexfoundry.core-data | grep edgexfoundry.core-data | grep inactive)" ]; then
+    echo "SMA failed to stop core-data"
+    snap_remove
+    exit 1
+fi
+
+# TODO: enable these other tests for Edinburgh where they will actually work
+# for delhi, only stopping services works with the SMA
+
+# issue a start command to the SMA for core-data
+edgexfoundry.curl \
+    --fail \
+    --header "Content-Type: application/json" \
+    --request POST \
+    --data '{"action":"start","services":["edgex-core-data"]}' \
+    localhost:48090/api/v1/operation
+
+# check that core-data is now running
+if [ -n "$(snap services edgexfoundry.core-data | grep edgexfoundry.core-data | grep inactive)" ]; then
+    echo "SMA failed to stop core-data"
+    snap_remove
+    exit 1
+fi
+
+# issue a bogus start command to the SMA to check that it returns an error message
+set +e
+fail_response = edgexfoundry.curl \
+    --fail \
+    --header "Content-Type: application/json" \
+    --request POST \
+    --data '{"action":"start","services":["NOT-A-REAL-SERVICE"]}' \
+    localhost:48090/api/v1/operation | edgexfoundry.jq '.[0].Success'
+
+if [ "$fail_response" == "false" ]; then
+    echo
+    echo "SMA erronously reports starting a non-existent service"
+    snap_remove
+    exit 1
+fi
+set -e
+
+snap_remove
diff --git a/data/geneva/utils.sh b/data/geneva/utils.sh
new file mode 100755
index 0000000..3eba383
--- /dev/null
+++ b/data/geneva/utils.sh
@@ -0,0 +1,296 @@
+#!/bin/bash -e
+
+if [ "$(id -u)" != "0" ]; then
+    echo "script must be run as root"
+    exit 1
+fi
+
+snap_install()
+{
+    local the_snap=$1
+    local the_channel=$2
+    local confinement=$3
+
+    if [ "$the_snap" = "edgexfoundry" ]; then
+        if [ -n "$confinement" ]; then
+            snap install "$the_snap" --channel="$the_channel" "$confinement"
+        else
+            snap install "$the_snap" --channel="$the_channel"
+        fi
+    else
+        if [ -n "$confinement" ]; then
+            snap install "$the_snap" "$confinement"
+        else
+            snap install "$the_snap"
+        fi
+    fi
+}
+
+snap_refresh()
+{
+    local the_snap=$1
+    local the_channel=$2
+    local confinement=$3
+
+    if [ "$the_snap" = "edgexfoundry" ]; then
+        if [ -n "$confinement" ]; then
+            snap refresh "$the_snap" --channel="$the_channel" "$confinement"
+        else
+            snap refresh "$the_snap" --channel="$the_channel"
+        fi
+    else
+        # for refreshing a file snap we need to use install
+        # but snapd still treats it like a refresh
+        if [ -n "$confinement" ]; then
+            snap install "$the_snap" "$confinement"
+        else
+            snap install "$the_snap"
+        fi
+    fi
+}
+
+snap_check_delhi_svcs() 
+{
+    if [ "$1" = "--notfatal" ]; then
+        FATAL=0
+    else   
+        FATAL=1
+    fi
+    # group services by status
+
+    # enabled services
+    # all the core-* services, security-services, consul, and all the mongo* services
+    for svc in core-command core-data core-metadata security-services mongod mongo-worker core-config-seed consul; do 
+        svcStatus="$(snap services edgexfoundry.$svc | grep $svc | awk '{print $2}')"
+        if [ "enabled" != "$svcStatus" ]; then
+            echo "service $svc has status \"$svcStatus\" but should be enabled"
+            if [ "$FATAL" = "1" ]; then
+                exit 1
+            fi
+        fi
+    done
+
+    # active services
+    # same as enabled, but without core-config-seed and without mongo-worker as 
+    # those are both oneshot daemons
+    for svc in core-command core-data core-metadata security-services mongod consul ; do 
+        svcStatus="$(snap services edgexfoundry.$svc | grep $svc | awk '{print $3}')"
+        if [ "active" != "$svcStatus" ]; then
+            echo "service $svc has status \"$svcStatus\" but should be active"
+            if [ "$FATAL" = "1" ]; then
+                exit 1
+            fi
+        fi
+    done
+
+    # disabled services
+    for svc in export-distro export-client support-notifications support-scheduler support-rulesengine support-logging device-virtual device-mqtt device-modbus device-random; do 
+        svcStatus="$(snap services edgexfoundry.$svc | grep $svc | awk '{print $2}')"
+        if [ "disabled" != "$svcStatus" ]; then
+            echo "service $svc has status \"$svcStatus\" but should be disabled"
+            if [ "$FATAL" = "1" ]; then
+                exit 1
+            fi
+        fi
+    done
+
+    # inactive services
+    # all the disabled services + core-config-seed + mongo-worker
+    for svc in export-distro export-client support-notifications support-scheduler support-rulesengine support-logging device-virtual device-modbus device-mqtt device-random core-config-seed; do 
+        svcStatus="$(snap services edgexfoundry.$svc | grep $svc | awk '{print $3}')"
+        if [ "inactive" != "$svcStatus" ]; then
+            echo "service $svc has status \"$svcStatus\" but should be inactive"
+            if [ "$FATAL" = "1" ]; then
+                exit 1
+            fi
+        fi
+    done
+}
+
+snap_check_edinburgh_svcs() 
+{
+    if [ "$1" = "--notfatal" ]; then
+        FATAL=0
+    else   
+        FATAL=1
+    fi
+    # group services by status
+
+    # enabled services
+    # all the core-* services, security-services, consul, and all the mongo* services
+    for svc in cassandra consul core-command core-config-seed core-data core-metadata edgexproxy kong-daemon mongo-worker mongod pkisetup sys-mgmt-agent vault vault-worker; do 
+        svcStatus="$(snap services edgexfoundry.$svc | grep $svc | awk '{print $2}')"
+        if [ "enabled" != "$svcStatus" ]; then
+            echo "service $svc has status \"$svcStatus\" but should be enabled"
+            if [ "$FATAL" = "1" ]; then
+                exit 1
+            fi
+        fi
+    done
+
+    # active services
+    # same as enabled, but without core-config-seed, mongo-worker, edgexproxy, pkisetup or vault-worker as 
+    # those are all oneshot daemons
+    for svc in cassandra consul core-command core-data core-metadata kong-daemon mongod sys-mgmt-agent vault; do 
+        svcStatus="$(snap services edgexfoundry.$svc | grep $svc | awk '{print $3}')"
+        if [ "active" != "$svcStatus" ]; then
+            echo "service $svc has status \"$svcStatus\" but should be active"
+            if [ "$FATAL" = "1" ]; then
+                exit 1
+            fi
+        fi
+    done
+
+    # disabled services
+    for svc in device-random export-client export-distro support-logging support-notifications support-rulesengine support-scheduler; do 
+        svcStatus="$(snap services edgexfoundry.$svc | grep $svc | awk '{print $2}')"
+        if [ "disabled" != "$svcStatus" ]; then
+            echo "service $svc has status \"$svcStatus\" but should be disabled"
+            if [ "$FATAL" = "1" ]; then
+                exit 1
+            fi
+        fi
+    done
+
+    # inactive services
+    # all the disabled services + the oneshot daemons
+    for svc in core-config-seed device-random edgexproxy export-client export-distro mongo-worker pkisetup support-logging support-notifications support-rulesengine support-scheduler vault-worker; do 
+        svcStatus="$(snap services edgexfoundry.$svc | grep $svc | awk '{print $3}')"
+        if [ "inactive" != "$svcStatus" ]; then
+            echo "service $svc has status \"$svcStatus\" but should be inactive"
+            if [ "$FATAL" = "1" ]; then
+                exit 1
+            fi
+        fi
+    done
+}
+
+snap_check_fuji_svcs()
+{
+    if [ "$1" = "--notfatal" ]; then
+        FATAL=0
+    else   
+        FATAL=1
+    fi
+    # group services by status
+
+    # enabled services
+    # all the core-* services, security-services, consul, and all the *mongo* services
+    for svc in consul core-command core-config-seed core-data core-metadata edgex-mongo kong-daemon mongod postgres security-proxy-setup security-secrets-setup security-secretstore-setup sys-mgmt-agent vault; do
+        svcStatus="$(snap services edgexfoundry.$svc | grep $svc | awk '{print $2}')"
+        if [ "enabled" != "$svcStatus" ]; then
+            echo "service $svc has status \"$svcStatus\" but should be enabled"
+            if [ "$FATAL" = "1" ]; then
+                exit 1
+            fi
+        fi
+    done
+
+    # active services
+    # same as enabled, but without core-config-seed, edgex-mongo, security-*-setup as those are all oneshot daemons
+    for svc in consul core-command core-data core-metadata kong-daemon redis postgres sys-mgmt-agent vault; do
+        svcStatus="$(snap services edgexfoundry.$svc | grep $svc | awk '{print $3}')"
+        if [ "active" != "$svcStatus" ]; then
+            echo "service $svc has status \"$svcStatus\" but should be active"
+            if [ "$FATAL" = "1" ]; then
+                exit 1
+            fi
+        fi
+    done
+
+    # disabled services
+    for svc in app-service-configurable device-virtual export-client export-distro support-logging mongod support-notifications support-rulesengine support-scheduler; do
+        svcStatus="$(snap services edgexfoundry.$svc | grep $svc | awk '{print $2}')"
+        if [ "disabled" != "$svcStatus" ]; then
+            echo "service $svc has status \"$svcStatus\" but should be disabled"
+            if [ "$FATAL" = "1" ]; then
+                exit 1
+            fi
+        fi
+    done
+
+    # inactive services
+    # all the disabled services + the oneshot daemons
+    for svc in app-service-configurable device-virtual edgex-mongo export-client export-distro mongod security-proxy-setup security-secrets-setup security-secretstore-setup support-logging support-notifications support-rulesengine support-scheduler; do
+        svcStatus="$(snap services edgexfoundry.$svc | grep $svc | awk '{print $3}')"
+        if [ "inactive" != "$svcStatus" ]; then
+            echo "service $svc has status \"$svcStatus\" but should be inactive"
+            if [ "$FATAL" = "1" ]; then
+                exit 1
+            fi
+        fi
+    done
+}
+
+snap_check_geneva_svcs()
+{
+    if [ "$1" = "--notfatal" ]; then
+        FATAL=0
+    else   
+        FATAL=1
+    fi
+    # group services by status
+
+    # enabled services
+    # all the core-* services, security-services, consul, and redis
+    for svc in consul core-command core-data core-metadata kong-daemon redis postgres security-proxy-setup security-secrets-setup security-secretstore-setup sys-mgmt-agent vault; do
+        svcStatus="$(snap services edgexfoundry.$svc | grep $svc | awk '{print $2}')"
+        if [ "enabled" != "$svcStatus" ]; then
+            echo "service $svc has status \"$svcStatus\" but should be enabled"
+            if [ "$FATAL" = "1" ]; then
+                exit 1
+            fi
+        fi
+    done
+
+    # active services
+    # same as enabled, but without security-*-setup as those are all oneshot daemons
+    for svc in consul core-command core-data core-metadata kong-daemon redis postgres sys-mgmt-agent vault; do
+        svcStatus="$(snap services edgexfoundry.$svc | grep $svc | awk '{print $3}')"
+        if [ "active" != "$svcStatus" ]; then
+            echo "service $svc has status \"$svcStatus\" but should be active"
+            if [ "$FATAL" = "1" ]; then
+                exit 1
+            fi
+        fi
+    done
+
+    # disabled services
+    for svc in app-service-configurable device-virtual edgex-mongo support-logging mongod support-notifications support-rulesengine support-scheduler; do
+        svcStatus="$(snap services edgexfoundry.$svc | grep $svc | awk '{print $2}')"
+        if [ "disabled" != "$svcStatus" ]; then
+            echo "service $svc has status \"$svcStatus\" but should be disabled"
+            if [ "$FATAL" = "1" ]; then
+                exit 1
+            fi
+        fi
+    done
+
+    # inactive services
+    # all the disabled services + the oneshot daemons
+    for svc in app-service-configurable device-virtual edgex-mongo mongod security-proxy-setup security-secrets-setup security-secretstore-setup support-logging support-notifications support-rulesengine support-scheduler; do
+        svcStatus="$(snap services edgexfoundry.$svc | grep $svc | awk '{print $3}')"
+        if [ "inactive" != "$svcStatus" ]; then
+            echo "service $svc has status \"$svcStatus\" but should be inactive"
+            if [ "$FATAL" = "1" ]; then
+                exit 1
+            fi
+        fi
+    done
+}
+
+get_snap_svc_status()
+{
+    case "$1" in 
+        "status")
+            svcStatus="$(snap services edgexfoundry.$1 | grep $1 | awk '{print $3}')"
+            ;;
+        "")
+            ;;
+    esac
+}
+
+snap_remove()
+{
+    snap remove edgexfoundry || true
+}
diff --git a/data/hanoi/placeholder.txt b/data/hanoi/placeholder.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/data/hanoi/placeholder.txt
diff --git a/data/ireland/placeholder.txt b/data/ireland/placeholder.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/data/ireland/placeholder.txt
diff --git a/data/jakarta/placeholder.txt b/data/jakarta/placeholder.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/data/jakarta/placeholder.txt
diff --git a/units/jobs.pxu b/units/fuji.pxu
similarity index 66%
rename from units/jobs.pxu
rename to units/fuji.pxu
index a435bed..88695e7 100644
--- a/units/jobs.pxu
+++ b/units/fuji.pxu
@@ -1,62 +1,62 @@
-id: edgex/install
+id: edgex/fuji/install
 _summary: Test installation of EdgeX snap
-command: test-install.sh
+command: $PLAINBOX_PROVIDER_DATA/fuji/test-install.sh
 user: root
 category_id: edgex
 flags: simple
 
-id: edgex/security-services-proxy-certs
+id: edgex/fuji/security-services-proxy-certs
 _summary: Test security services proxy certs work properly
-command: test-security-services-proxy-certs.sh
+command: $PLAINBOX_PROVIDER_DATA/fuji/test-security-services-proxy-certs.sh
 user: root
 category_id: edgex
 flags: simple
 
-id: edgex/services-alive
+id: edgex/fuji/services-alive
 _summary: Test that all services can be started properly
-command: test-services-alive.sh
+command: $PLAINBOX_PROVIDER_DATA/fuji/test-services-alive.sh
 user: root
 category_id: edgex
 flags: simple
 
-id: edgex/device-random
+id: edgex/fuji/device-random
 _summary: Test that device-random works with core-data and core-metadata
-command: test-device-random.sh
+command: $PLAINBOX_PROVIDER_DATA/fuji/test-device-random.sh
 user: root
 category_id: edgex
 flags: simple
 
-id: edgex/install-config-paths
+id: edgex/fuji/install-config-paths
 _summary: Test that installing uses "current" based filepaths in config files
-command: test-install-config-paths.sh
+command: $PLAINBOX_PROVIDER_DATA/fuji/test-install-config-paths.sh
 user: root
 category_id: edgex
 flags: simple
 
-id: edgex/refresh-config-paths
+id: edgex/fuji/refresh-config-paths
 _summary: Test that refreshing uses "current" based filepaths in config files
-command: test-refresh-config-paths.sh
+command: $PLAINBOX_PROVIDER_DATA/fuji/test-refresh-config-paths.sh
 user: root
 category_id: edgex
 flags: simple
 
-id: edgex/refresh-services
+id: edgex/fuji/refresh-services
 _summary: Test that services start after refreshing 
-command: test-refresh-services.sh
+command: $PLAINBOX_PROVIDER_DATA/fuji/test-refresh-services.sh
 user: root
 category_id: edgex
 flags: simple
 
-id: edgex/self-refresh-services
+id: edgex/fuji/self-refresh-services
 _summary: Test that services start after refreshing to this revision from self 
-command: test-self-refresh-services.sh
+command: $PLAINBOX_PROVIDER_DATA/fuji/test-self-refresh-services.sh
 user: root
 category_id: edgex
 flags: simple
 
-id: edgex/sys-mgmt-agent
+id: edgex/fuji/sys-mgmt-agent
 _summary: Test that the system management agent works with the snap
-command: test-sys-mgmt-agent.sh
+command: $PLAINBOX_PROVIDER_DATA/fuji/test-sys-mgmt-agent.sh
 user: root
 category_id: edgex
 flags: simple
diff --git a/units/geneva.pxu b/units/geneva.pxu
new file mode 100644
index 0000000..f08f90c
--- /dev/null
+++ b/units/geneva.pxu
@@ -0,0 +1,55 @@
+id: edgex/geneva/install
+_summary: Test installation of EdgeX snap
+command: $PLAINBOX_PROVIDER_DATA/geneva/test-install.sh
+user: root
+category_id: edgex
+flags: simple
+
+id: edgex/geneva/security-services-proxy-certs
+_summary: Test security services proxy certs work properly
+command: $PLAINBOX_PROVIDER_DATA/geneva/test-security-services-proxy-certs.sh
+user: root
+category_id: edgex
+flags: simple
+
+id: edgex/geneva/services-alive
+_summary: Test that all services can be started properly
+command: $PLAINBOX_PROVIDER_DATA/geneva/test-services-alive.sh
+user: root
+category_id: edgex
+flags: simple
+
+id: edgex/geneva/install-config-paths
+_summary: Test that installing uses "current" based filepaths in config files
+command: $PLAINBOX_PROVIDER_DATA/geneva/test-install-config-paths.sh
+user: root
+category_id: edgex
+flags: simple
+
+id: edgex/geneva/refresh-config-paths
+_summary: Test that refreshing uses "current" based filepaths in config files
+command: $PLAINBOX_PROVIDER_DATA/geneva/test-refresh-config-paths.sh
+user: root
+category_id: edgex
+flags: simple
+
+id: edgex/geneva/refresh-services
+_summary: Test that services start after refreshing 
+command: $PLAINBOX_PROVIDER_DATA/geneva/test-refresh-services.sh
+user: root
+category_id: edgex
+flags: simple
+
+id: edgex/geneva/self-refresh-services
+_summary: Test that services start after refreshing to this revision from self
+command: $PLAINBOX_PROVIDER_DATA/geneva/test-self-refresh-services.sh
+user: root
+category_id: edgex
+flags: simple
+
+id: edgex/geneva/sys-mgmt-agent
+_summary: Test that the system management agent works with the snap
+command: $PLAINBOX_PROVIDER_DATA/geneva/test-sys-mgmt-agent.sh
+user: root
+category_id: edgex
+flags: simple
diff --git a/units/test-plan.pxu b/units/test-plan.pxu
index f5d96b0..d9524a3 100644
--- a/units/test-plan.pxu
+++ b/units/test-plan.pxu
@@ -1,6 +1,13 @@
-id: edgex-tp
+id: edgex-fuji-tp
 unit: test plan
-_name: EdgeX
-_description: EdgeX tests
+_name: EdgeX Fuji
+_description: EdgeX Fuji tests
 include:
-    edgex/.*
+    edgex/fuji/.*
+
+id: edgex-geneva-tp
+unit: test plan
+_name: EdgeX Geneva
+_description: EdgeX Geneva tests
+include:
+    edgex/geneva/.*