cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #143375 from Synthetica9/google-cloud-sdk

Browse source
This commit is contained in:
Patrick Hilhorst 2021-10-29 18:11:53 +02:00 committed by GitHub
commit 7dd444121a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/tests/all-tests.nix
View file

@ -157,7 +157,6 @@ in
gobgpd = handleTest ./gobgpd.nix {}; gobgpd = handleTest ./gobgpd.nix {};
gocd-agent = handleTest ./gocd-agent.nix {}; gocd-agent = handleTest ./gocd-agent.nix {};
gocd-server = handleTest ./gocd-server.nix {}; gocd-server = handleTest ./gocd-server.nix {};
google-cloud-sdk = handleTest ./google-cloud-sdk.nix {};
google-oslogin = handleTest ./google-oslogin {}; google-oslogin = handleTest ./google-oslogin {};
gotify-server = handleTest ./gotify-server.nix {}; gotify-server = handleTest ./gotify-server.nix {};
grafana = handleTest ./grafana.nix {}; grafana = handleTest ./grafana.nix {};

13
nixos/tests/google-cloud-sdk.nix
View file

@ -1,13 +0,0 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "google-cloud-sdk";
meta = with pkgs.lib.maintainers; { maintainers = [ iammrinal0 ]; };
machine = { pkgs, ... }: {
environment.systemPackages = [ pkgs.google-cloud-sdk ];
};
testScript = ''
import json
assert "${pkgs.google-cloud-sdk.version}" in json.loads(machine.succeed("gcloud version --format json"))["Google Cloud SDK"]
'';
})

7
pkgs/tools/admin/google-cloud-sdk/default.nix
View file

@ -117,9 +117,10 @@ in stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru = { doInstallCheck = true;
tests = { inherit (nixosTests) google-cloud-sdk; }; installCheckPhase = ''
}; $out/bin/gcloud version --format json | jq '."Google Cloud SDK"' | grep "${version}"
'';
meta = with lib; { meta = with lib; {
description = "Tools for the google cloud platform"; description = "Tools for the google cloud platform";