Merge ~morphis/snappy-hwe-snaps/+git/jenkins-jobs:skip-tests-on-non-amd64 into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

[Simon Fels]

jobs/snap: disable test execution when specified architecture is not amd64

The current setup doesn't support any other architectures than amd64
at the moment.

[Roberto Mier Escandon (rmescandon)]

lgtm

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:3c1f55685a9b896e1710861656c36cbbd46b26b5
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/2
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/2
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/2
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/2

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/2/rebuild

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

LGTM

review: Approve

diff --git a/jobs/snap/snap-test.sh b/jobs/snap/snap-test.sh
index 6e4ab9f..752b375 100644
--- a/jobs/snap/snap-test.sh
+++ b/jobs/snap/snap-test.sh
@@ -18,6 +18,11 @@ set -ex
 
 . "$WORKSPACE/.build_env"
 
+if [ -z "$ARCHITECTURE" ] || [ "$ARCHITECTURE" != amd64 ] ; then
+    echo "WARNING: Skipping tests as only supported on amd64 for the moment"
+    exit 0
+fi
+
 if [ "$RUN_TESTS" = False ]; then
     echo "WARNING: test execution is disabled"
     exit 0
diff --git a/jobs/snap/snap-test.yaml b/jobs/snap/snap-test.yaml
index a361bbd..9cc5cea 100644
--- a/jobs/snap/snap-test.yaml
+++ b/jobs/snap/snap-test.yaml
@@ -8,6 +8,10 @@
     node: snap && test
     parameters:
         - string:
+            name: ARCHITECTURE
+            default: ""
+            description: "Architecture to run tests on"
+        - string:
             name: SOURCE_GIT_REPO
             default: ""
             description: "Source git repository"