Merge branch 'add-nixos-test-to-gitlab'
* add-nixos-test-to-gitlab: gitlab: add link to nixos test in passthru.tests
This commit is contained in:
commit
b7d2f37680
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
|
{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
|
||||||
, ruby, tzdata, git, procps, nettools
|
, ruby, tzdata, git, procps, nettools, nixosTests
|
||||||
, gitlabEnterprise ? false
|
, gitlabEnterprise ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -95,6 +95,9 @@ stdenv.mkDerivation rec {
|
||||||
GITLAB_PAGES_VERSION = data.passthru.GITLAB_PAGES_VERSION;
|
GITLAB_PAGES_VERSION = data.passthru.GITLAB_PAGES_VERSION;
|
||||||
GITLAB_SHELL_VERSION = data.passthru.GITLAB_SHELL_VERSION;
|
GITLAB_SHELL_VERSION = data.passthru.GITLAB_SHELL_VERSION;
|
||||||
GITLAB_WORKHORSE_VERSION = data.passthru.GITLAB_WORKHORSE_VERSION;
|
GITLAB_WORKHORSE_VERSION = data.passthru.GITLAB_WORKHORSE_VERSION;
|
||||||
|
tests = {
|
||||||
|
nixos-test-passes = nixosTests.gitlab;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
Loading…
Reference in a new issue