Skip to content

Commit 301b34a

Browse files
author
bot
committed
Update the configuration mirror.
1 parent 808b0e9 commit 301b34a

5 files changed

Lines changed: 86 additions & 43 deletions

File tree

config/generated.mobile-nixos.tf

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,51 @@ resource "hydra_project" "mobile-nixos" {
88
visible = false
99
}
1010

11+
resource "hydra_jobset" "mobile-nixos_unstable" {
12+
project = hydra_project.mobile-nixos.name
13+
state = "enabled"
14+
visible = true
15+
name = "unstable"
16+
type = "legacy"
17+
description = "Mobile NixOS, built with nixos-unstable."
18+
19+
nix_expression {
20+
file = "release.nix"
21+
input = "mobile-nixos"
22+
}
23+
24+
input {
25+
name = "inNixOSHydra"
26+
type = "boolean"
27+
value = "true"
28+
notify_committers = false
29+
}
30+
31+
input {
32+
name = "mobile-nixos"
33+
type = "git"
34+
value = "https://github.com/NixOS/mobile-nixos.git development"
35+
notify_committers = false
36+
}
37+
38+
input {
39+
name = "nixpkgs"
40+
type = "git"
41+
value = "https://github.com/NixOS/nixpkgs.git nixos-unstable"
42+
notify_committers = false
43+
}
44+
45+
input {
46+
name = "systems"
47+
type = "nix"
48+
value = "[ \"aarch64-linux\" \"x86_64-linux\" ]"
49+
notify_committers = false
50+
}
51+
52+
check_interval = 86400
53+
scheduling_shares = 1000
54+
keep_evaluations = 1
55+
56+
email_notifications = false
57+
email_override = ""
58+
}

config/generated.nixos.tf

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,41 @@ resource "hydra_jobset" "nixos_closure-size" {
211211
email_override = ""
212212
}
213213

214+
resource "hydra_jobset" "nixos_disable-nix-in-nixos-tests" {
215+
project = hydra_project.nixos.name
216+
state = "enabled"
217+
visible = true
218+
name = "disable-nix-in-nixos-tests"
219+
type = "legacy"
220+
description = "Testing PR #1706: disable nix in nixos tests"
221+
222+
nix_expression {
223+
file = "nixos/release-combined.nix"
224+
input = "nixpkgs"
225+
}
226+
227+
input {
228+
name = "nixpkgs"
229+
type = "git"
230+
value = "https://github.com/roberth/nixpkgs.git nixosTests-no-nix-experiment"
231+
notify_committers = false
232+
}
233+
234+
input {
235+
name = "stableBranch"
236+
type = "boolean"
237+
value = "false"
238+
notify_committers = false
239+
}
240+
241+
check_interval = -12456789
242+
scheduling_shares = 100
243+
keep_evaluations = 0
244+
245+
email_notifications = false
246+
email_override = ""
247+
}
248+
214249
resource "hydra_jobset" "nixos_gcc-4_9" {
215250
project = hydra_project.nixos.name
216251
state = "disabled"

config/generated.nixpkgs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5517,7 +5517,7 @@ resource "hydra_jobset" "nixpkgs_staging-next-25_11" {
55175517
}
55185518

55195519
check_interval = -12456789
5520-
scheduling_shares = 123456
5520+
scheduling_shares = 12345
55215521
keep_evaluations = 1
55225522

55235523
email_notifications = false

config/generated.node-hydra-connector.tf

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,3 @@ resource "hydra_project" "node-hydra-connector" {
88
visible = true
99
}
1010

11-
resource "hydra_jobset" "node-hydra-connector_node-hydra-connector-master" {
12-
project = hydra_project.node-hydra-connector.name
13-
state = "enabled"
14-
visible = true
15-
name = "node-hydra-connector-master"
16-
type = "legacy"
17-
description = "Node Hydra connector master"
18-
19-
nix_expression {
20-
file = "release.nix"
21-
input = "node_hydra_connector"
22-
}
23-
24-
input {
25-
name = "nixpkgs"
26-
type = "git"
27-
value = "https://github.com/nixos/nixpkgs.git release-18.03"
28-
notify_committers = false
29-
}
30-
31-
input {
32-
name = "node_hydra_connector"
33-
type = "git"
34-
value = "https://github.com/svanderburg/node-hydra-connector.git"
35-
notify_committers = false
36-
}
37-
38-
input {
39-
name = "officialRelease"
40-
type = "boolean"
41-
value = "false"
42-
notify_committers = false
43-
}
44-
45-
check_interval = 3600
46-
scheduling_shares = 1
47-
keep_evaluations = 3
48-
49-
email_notifications = false
50-
email_override = ""
51-
}

config/import

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ terraform import hydra_jobset.hydra_hydra-ant-logger-trunk hydra/hydra-ant-logge
66
terraform import hydra_jobset.hydra_hydra-master hydra/hydra-master
77
terraform import hydra_jobset.hydra_master hydra/master
88
terraform import hydra_jobset.hydra_nix-next hydra/nix-next
9+
terraform import hydra_jobset.mobile-nixos_unstable mobile-nixos/unstable
910
terraform import hydra_jobset.nix-installer_nix-installer nix-installer/nix-installer
1011
terraform import hydra_jobset.nix-installer_pr-51 nix-installer/pr-51
1112
terraform import hydra_jobset.nix_PR-13718 nix/PR-13718
@@ -80,6 +81,7 @@ terraform import hydra_jobset.nixos_binutils-2_26 nixos/binutils-2.26
8081
terraform import hydra_jobset.nixos_binutils-2_34 nixos/binutils-2.34
8182
terraform import hydra_jobset.nixos_boot-order nixos/boot-order
8283
terraform import hydra_jobset.nixos_closure-size nixos/closure-size
84+
terraform import hydra_jobset.nixos_disable-nix-in-nixos-tests nixos/disable-nix-in-nixos-tests
8385
terraform import hydra_jobset.nixos_gcc-4_9 nixos/gcc-4.9
8486
terraform import hydra_jobset.nixos_gcc-5 nixos/gcc-5
8587
terraform import hydra_jobset.nixos_gcc-6 nixos/gcc-6
@@ -352,7 +354,6 @@ terraform import hydra_jobset.nixpkgs_toonn-wip nixpkgs/toonn-wip
352354
terraform import hydra_jobset.nixpkgs_unstable nixpkgs/unstable
353355
terraform import hydra_jobset.nixpkgs_vcunat-stdenv nixpkgs/vcunat-stdenv
354356
terraform import hydra_jobset.nixpkgs_xorg-test nixpkgs/xorg-test
355-
terraform import hydra_jobset.node-hydra-connector_node-hydra-connector-master node-hydra-connector/node-hydra-connector-master
356357
terraform import hydra_jobset.ofborg_cole-flake ofborg/cole-flake
357358
terraform import hydra_jobset.ofborg_next ofborg/next
358359
terraform import hydra_jobset.ofborg_release ofborg/release

0 commit comments

Comments
 (0)