ci: simplify test
Remove obsolete features that were required for pkgsUnstable.
This commit is contained in:
parent
0fd3be5343
commit
26a53f0d59
16
.cirrus.yml
16
.cirrus.yml
@ -16,22 +16,18 @@ task:
|
|||||||
timeout_in: 120m
|
timeout_in: 120m
|
||||||
|
|
||||||
name: modules_test
|
name: modules_test
|
||||||
environment:
|
|
||||||
nixpkgs: nixpkgs
|
|
||||||
container:
|
container:
|
||||||
# A maximum of 16 CPUs is shared among all concurrent tasks.
|
# A maximum of 16 CPUs is shared among all concurrent tasks.
|
||||||
# https://cirrus-ci.org/faq/#are-there-any-limits
|
# https://cirrus-ci.org/faq/#are-there-any-limits
|
||||||
cpu: 4
|
cpu: 4
|
||||||
matrix:
|
environment:
|
||||||
- environment:
|
matrix:
|
||||||
scenario: default
|
- scenario: default
|
||||||
- environment:
|
- scenario: netns
|
||||||
scenario: netns
|
- scenario: netnsRegtest
|
||||||
- environment:
|
|
||||||
scenario: netnsRegtest
|
|
||||||
|
|
||||||
# This script is run as root
|
# This script is run as root
|
||||||
build_script:
|
build_script:
|
||||||
- echo "sandbox = true" >> /etc/nix/nix.conf
|
- 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
|
- nix run -f '<nixpkgs>' bash coreutils cachix -c ./test/ci/build.sh
|
||||||
|
@ -7,9 +7,7 @@
|
|||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
scenario=${scenario:-}
|
if [[ -v CIRRUS_CI ]]; then
|
||||||
|
|
||||||
if [[ -v CIRRUS_CI && $scenario ]]; then
|
|
||||||
if [[ ! -e /dev/kvm ]]; then
|
if [[ ! -e /dev/kvm ]]; then
|
||||||
>&2 echo "No KVM available on VM host."
|
>&2 echo "No KVM available on VM host."
|
||||||
exit 1
|
exit 1
|
||||||
@ -20,10 +18,4 @@ fi
|
|||||||
|
|
||||||
echo "$NIX_PATH ($(nix eval --raw nixpkgs.lib.version))"
|
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
|
"${BASH_SOURCE[0]%/*}/../run-tests.sh" --ci --scenario $scenario
|
||||||
|
Loading…
Reference in New Issue
Block a user