fix tests

This commit is contained in:
David Arnold 2021-04-28 14:36:16 -05:00
parent cdddbc3f7d
commit 52c6472e90
No known key found for this signature in database
GPG key ID: 6D6A936E69C59D08
3 changed files with 13 additions and 11 deletions

View file

@ -9,15 +9,15 @@ stdenv.mkDerivation rec {
in { in {
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://github.com/rancher/k3s/releases/download/v${version}/k3s-airgap-images-amd64.tar"; url = "https://github.com/rancher/k3s/releases/download/v${version}/k3s-airgap-images-amd64.tar";
sha256 = "1fiq211vvsnxdzfx9ybb28yyyif08zls7bx3kl8xmv4hrf8xza4i"; sha256 = "sha256-6kQmlpNV+4cU1Kn5lyZhutXYK5qYdey0jubzYRRF3vA=";
}; };
aarch64-linux = fetchurl { aarch64-linux = fetchurl {
url = "https://github.com/rancher/k3s/releases/download/v${version}/k3s-airgap-images-arm64.tar"; url = "https://github.com/rancher/k3s/releases/download/v${version}/k3s-airgap-images-arm64.tar";
sha256 = "1xaggiw5h0zndgvdikg7babwd9903n9vabp1dkh53g8al812sfnd"; sha256 = "sha256-OlqqdAmBN+azT0kfjZ/Bd0CFbbW5hTg9/8T9U05N0zE=";
}; };
armv7l-linux = fetchurl { armv7l-linux = fetchurl {
url = "https://github.com/rancher/k3s/releases/download/v${version}/k3s-airgap-images-arm.tar"; url = "https://github.com/rancher/k3s/releases/download/v${version}/k3s-airgap-images-arm.tar";
sha256 = "1v90wyvj47hz4nphdq7isfbl758yrzg4bx7c73ghmlgvr6p9cdzb"; sha256 = "sha256-j/ARBtHDnfRk/7BpOvavoHe7L5dmsCZe5+wuZ5t4V/k=";
}; };
}.${stdenv.hostPlatform.system} or throwError; }.${stdenv.hostPlatform.system} or throwError;

View file

@ -192,11 +192,13 @@ let
networking.primaryIPAddress = mkForce "192.168.1.1"; networking.primaryIPAddress = mkForce "192.168.1.1";
}; };
testScript = '' skipLint = true;
startAll;
$kube->waitForUnit('k3s.service'); testScript = ''
$kube->waitUntilSucceeds("kubectl get node kube | grep -w Ready"); start_all()
kube.wait_for_unit('k3s.service')
kube.wait_until_succeeds("kubectl get node kube | grep -w Ready")
${testScript} ${testScript}
''; '';

View file

@ -32,11 +32,11 @@ in {
services.kubernetes.kubelet.seedDockerImages = config.docker.export; services.kubernetes.kubelet.seedDockerImages = config.docker.export;
}; };
testScript = '' testScript = ''
$kube->waitUntilSucceeds("kubectl apply -f ${config.kubernetes.result}"); kube.wait_until_succeeds("kubectl apply -f ${config.kubernetes.result}")
$kube->succeed("kubectl get deployment | grep -i nginx"); kube.succeed("kubectl get deployment | grep -i nginx")
$kube->waitUntilSucceeds("kubectl get deployment -o go-template nginx --template={{.status.readyReplicas}} | grep 10"); kube.wait_until_succeeds("kubectl get deployment -o go-template nginx --template={{.status.readyReplicas}} | grep 10")
$kube->waitUntilSucceeds("curl http://nginx.default.svc.cluster.local | grep -i hello"); kube.wait_until_succeeds("curl http://nginx.default.svc.cluster.local | grep -i hello")
''; '';
}; };