From 26a53f0d59a0865e56e2c4c3e7ae6bc602ff46cd Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 10 Dec 2021 14:07:56 +0100
Subject: [PATCH] ci: simplify test

Remove obsolete features that were required for pkgsUnstable.
---
 .cirrus.yml      | 16 ++++++----------
 test/ci/build.sh | 10 +---------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 131cc47..03ff10f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -16,22 +16,18 @@ task:
   timeout_in: 120m
 
   name: modules_test
-  environment:
-    nixpkgs: nixpkgs
   container:
     # A maximum of 16 CPUs is shared among all concurrent tasks.
     # https://cirrus-ci.org/faq/#are-there-any-limits
     cpu: 4
-  matrix:
-    - environment:
-        scenario: default
-    - environment:
-        scenario: netns
-    - environment:
-        scenario: netnsRegtest
+  environment:
+    matrix:
+      - scenario: default
+      - scenario: netns
+      - scenario: netnsRegtest
 
   # This script is run as root
   build_script:
     - echo "sandbox = true" >> /etc/nix/nix.conf
-    - export NIX_PATH="nixpkgs=$(nix eval --raw -f pkgs/nixpkgs-pinned.nix $nixpkgs)"
+    - export NIX_PATH="nixpkgs=$(nix eval --raw -f pkgs/nixpkgs-pinned.nix nixpkgs)"
     - nix run -f '<nixpkgs>' bash coreutils cachix -c ./test/ci/build.sh
diff --git a/test/ci/build.sh b/test/ci/build.sh
index dd04779..da711b8 100755
--- a/test/ci/build.sh
+++ b/test/ci/build.sh
@@ -7,9 +7,7 @@
 
 set -euo pipefail
 
-scenario=${scenario:-}
-
-if [[ -v CIRRUS_CI && $scenario ]]; then
+if [[ -v CIRRUS_CI ]]; then
     if [[ ! -e /dev/kvm ]]; then
         >&2 echo "No KVM available on VM host."
         exit 1
@@ -20,10 +18,4 @@ fi
 
 echo "$NIX_PATH ($(nix eval --raw nixpkgs.lib.version))"
 
-if [[ $scenario ]]; then
-    testArgs="--scenario $scenario"
-else
-    testArgs=pkgsUnstable
-fi
-
 "${BASH_SOURCE[0]%/*}/../run-tests.sh" --ci --scenario $scenario