tests: remove pkgsUnstable

The latest nixpkgs-unstable update would require node-based packages to
distinguish between stable and unstable when building. Instead of dealing with
that complexity, we will only guarantee compatability of our packages with
stable.
This commit is contained in:
Jonas Nick 2021-11-28 18:47:11 +00:00
parent 76737ead9f
commit daeea4012e
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
3 changed files with 13 additions and 35 deletions

View File

@ -15,25 +15,20 @@ task:
# Use the maximum timeout. Needed when rebuilding packages on a channel update. # Use the maximum timeout. Needed when rebuilding packages on a channel update.
timeout_in: 120m 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: matrix:
- name: modules_test - environment:
environment: scenario: default
nixpkgs: nixpkgs - environment:
container: scenario: netns
# A maximum of 16 CPUs is shared among all concurrent tasks. - environment:
# https://cirrus-ci.org/faq/#are-there-any-limits scenario: netnsRegtest
cpu: 4
matrix:
- environment:
scenario: default
- environment:
scenario: netns
- environment:
scenario: netnsRegtest
- name: pkgs_unstable
environment:
nixpkgs: nixpkgs-unstable
# This script is run as root # This script is run as root
build_script: build_script:

View File

@ -1,12 +0,0 @@
let
pinned = import ../pkgs/nixpkgs-pinned.nix;
pkgs = import pinned.nixpkgs-unstable {};
nbPkgs = import ../pkgs { inherit pkgs; };
pkgsUnstable = with nbPkgs; [
# Disabled because joinmarket dependencies currently don't build on on unstable.
# joinmarket
rtl
cl-rest
];
in
pkgs.writeText "pkgs-unstable" (pkgs.lib.concatMapStringsSep "\n" toString pkgsUnstable)

View File

@ -246,10 +246,6 @@ vmTestNixExpr() {
EOF EOF
} }
pkgsUnstable() {
doBuild pkgs-unstable "$scriptDir/pkgs-unstable.nix"
}
# A basic subset of tests to keep the total runtime within # A basic subset of tests to keep the total runtime within
# manageable bounds (<4 min on desktop systems). # manageable bounds (<4 min on desktop systems).
# These are also run on the CI server. # These are also run on the CI server.
@ -257,7 +253,6 @@ basic() {
scenario=default buildTest "$@" scenario=default buildTest "$@"
scenario=netns buildTest "$@" scenario=netns buildTest "$@"
scenario=netnsRegtest buildTest "$@" scenario=netnsRegtest buildTest "$@"
pkgsUnstable
} }
# All tests that only consist of building a nix derivation. # All tests that only consist of building a nix derivation.