3 files changed, 53 insertions, 78 deletions
diff --git a/tools/nixery/.github/workflows/build-and-test.yaml b/tools/nixery/.github/workflows/build-and-test.yaml
index 1036220aaffd..3ae4e639e31e 100644
--- a/tools/nixery/.github/workflows/build-and-test.yaml
+++ b/tools/nixery/.github/workflows/build-and-test.yaml
@@ -26,3 +26,5 @@ jobs:
         run: "test -z $(gofmt -l .)"
       - name: Build Nixery
         run: "nix-build --arg maxLayers 2"
+      - name: Run integration test
+        run: scripts/integration-test.sh
diff --git a/tools/nixery/.travis.yml b/tools/nixery/.travis.yml
deleted file mode 100644
index fcf2034d4472..000000000000
--- a/tools/nixery/.travis.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-language: nix
-arch:
-  - amd64
-  - arm64
-services:
-  - docker
-env:
-  - NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/0a40a3999eb4d577418515da842a2622a64880c5.tar.gz
-before_script:
-  - echo "Running Nixery CI build on $(uname -m)"
-  - mkdir test-files
-  - echo ${GOOGLE_KEY} | base64 -d > test-files/key.json
-  - echo ${GCS_SIGNING_PEM} | base64 -d > test-files/gcs.pem
-  - nix-env -f '<nixpkgs>' -iA -A go
-script:
-  - test -z $(gofmt -l server/ build-image/)
-  - nix-build --arg maxLayers 2
-
-  # This integration test makes sure that the container image built
-  # for Nixery itself runs fine in Docker, and that images pulled
-  # from it work in Docker.
-  #
-  # Output from the Nixery container is printed at the end of the
-  # test regardless of test status.
-  - IMG=$(docker load -q -i $(nix-build -A nixery-image) | awk '{ print $3 }')
-  - echo "Loaded Nixery image as ${IMG}"
-
-  - |
-    docker run -d -p 8080:8080 --name nixery \
-      -v ${PWD}/test-files:/var/nixery \
-      -e PORT=8080 \
-      -e GCS_BUCKET=nixery-ci-tests \
-      -e GOOGLE_CLOUD_PROJECT=nixery \
-      -e GOOGLE_APPLICATION_CREDENTIALS=/var/nixery/key.json \
-      -e NIXERY_CHANNEL=nixos-unstable \
-      -e NIXERY_STORAGE_BACKEND=gcs \
-      ${IMG}
-
-  # print all of the container's logs regardless of success
-  - |
-    function print_logs {
-      echo "Nixery container logs:"
-      docker logs nixery
-    }
-    trap print_logs EXIT
-
-  # Give the container ~20 seconds to come up
-  - |
-    attempts=0
-    echo -n "Waiting for Nixery to start ..."
-    until $(curl --fail --silent "http://localhost:8080/v2/"); do
-      [[ attempts -eq 30 ]] && echo "Nixery container failed to start!" && exit 1
-      ((attempts++))
-      echo -n "."
-      sleep 1
-    done
-
-  # Pull and run an image of the current CPU architecture
-  - |
-    case $(uname -m) in
-      x86_64)
-        docker run --rm localhost:8080/hello hello
-        ;;
-      aarch64)
-        docker run --rm localhost:8080/arm64/hello hello
-        ;;
-    esac
-
-  # Pull an image of the opposite CPU architecture (but without running it)
-  - |
-    case $(uname -m) in
-    x86_64)
-      docker pull localhost:8080/arm64/hello
-      ;;
-    aarch64)
-      docker pull localhost:8080/hello
-      ;;
-    esac
diff --git a/tools/nixery/scripts/integration-test.sh b/tools/nixery/scripts/integration-test.sh
new file mode 100755
index 000000000000..9595f37d9417
--- /dev/null
+++ b/tools/nixery/scripts/integration-test.sh
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+set -eou pipefail
+
+# This integration test makes sure that the container image built
+# for Nixery itself runs fine in Docker, and that images pulled
+# from it work in Docker.
+
+IMG=$(docker load -q -i "$(nix-build -A nixery-image)" | awk '{ print $3 }')
+echo "Loaded Nixery image as ${IMG}"
+
+# Run the built nixery docker image in the background, but keep printing its
+# output as it occurs.
+docker run --rm -p 8080:8080 --name nixery \
+  -e PORT=8080 \
+  --mount type=tmpfs,destination=/var/cache/nixery \
+  -e NIXERY_CHANNEL=nixos-unstable \
+  -e NIXERY_STORAGE_BACKEND=filesystem \
+  -e STORAGE_PATH=/var/cache/nixery \
+  "${IMG}" &
+
+# Give the container ~20 seconds to come up
+set +e
+attempts=0
+echo -n "Waiting for Nixery to start ..."
+until curl --fail --silent "http://localhost:8080/v2/"; do
+  [[ attempts -eq 30 ]] && echo "Nixery container failed to start!" && exit 1
+  ((attempts++))
+  echo -n "."
+  sleep 1
+done
+set -e
+
+# Pull and run an image of the current CPU architecture
+case $(uname -m) in
+  x86_64)
+    docker run --rm localhost:8080/hello hello
+    ;;
+  aarch64)
+    docker run --rm localhost:8080/arm64/hello hello
+    ;;
+esac
+
+# Pull an image of the opposite CPU architecture (but without running it)
+case $(uname -m) in
+x86_64)
+  docker pull localhost:8080/arm64/hello
+  ;;
+aarch64)
+  docker pull localhost:8080/hello
+  ;;
+esac