From 6f57b7a8a8008df274c54accf962453675bc311b Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 25 Mar 2019 10:54:52 +0800 Subject: [PATCH] reorganize Hydra projects --- hydra-project.json => hydra/artiq.json | 2 +- jobsets.nix => hydra/artiq.nix | 33 -------------------------- hydra/fpga.json | 16 +++++++++++++ hydra/fpga.nix | 26 ++++++++++++++++++++ hydra/stm32.json | 16 +++++++++++++ hydra/stm32.nix | 27 +++++++++++++++++++++ 6 files changed, 86 insertions(+), 34 deletions(-) rename hydra-project.json => hydra/artiq.json (92%) rename jobsets.nix => hydra/artiq.nix (57%) create mode 100644 hydra/fpga.json create mode 100644 hydra/fpga.nix create mode 100644 hydra/stm32.json create mode 100644 hydra/stm32.nix diff --git a/hydra-project.json b/hydra/artiq.json similarity index 92% rename from hydra-project.json rename to hydra/artiq.json index dcbbda2..4968a65 100644 --- a/hydra-project.json +++ b/hydra/artiq.json @@ -3,7 +3,7 @@ "hidden": true, "description": "js", "nixexprinput": "nixScripts", - "nixexprpath": "jobsets.nix", + "nixexprpath": "hydra/artiq.nix", "checkinterval": 300, "schedulingshares": 10, "enableemail": false, diff --git a/jobsets.nix b/hydra/artiq.nix similarity index 57% rename from jobsets.nix rename to hydra/artiq.nix index 1133aa7..897f583 100644 --- a/jobsets.nix +++ b/hydra/artiq.nix @@ -38,39 +38,6 @@ "sinaraSystemsSrc": { "type": "git", "value": "git://github.com/m-labs/sinara-systems.git master 1", "emailresponsible": false }, "m-labs": { "type": "sysbuild", "value": "artiq:main:generated-nix", "emailresponsible": false } } - }, - "adc2tcp": { - "enabled": 1, - "hidden": false, - "description": "STM32 demo", - "nixexprinput": "adc2tcp", - "nixexprpath": "release.nix", - "checkinterval": 300, - "schedulingshares": 10, - "enableemail": false, - "emailoverride": "", - "keepnr": 10, - "inputs": { - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-18.09", "emailresponsible": false }, - "adc2tcp": { "type": "git", "value": "git://github.com/m-labs/adc2tcp.git", "emailresponsible": false }, - "mozillaOverlay": { "type": "git", "value": "git://github.com/mozilla/nixpkgs-mozilla.git", "emailresponsible": false } - } - }, - "heavyx": { - "enabled": 1, - "hidden": false, - "description": "HeavyX SoC toolkit experiment", - "nixexprinput": "heavyx", - "nixexprpath": "default.nix", - "checkinterval": 300, - "schedulingshares": 10, - "enableemail": false, - "emailoverride": "", - "keepnr": 10, - "inputs": { - "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-19.03", "emailresponsible": false }, - "heavyx": { "type": "git", "value": "git://github.com/m-labs/heavyx.git", "emailresponsible": false } - } } } EOF diff --git a/hydra/fpga.json b/hydra/fpga.json new file mode 100644 index 0000000..89fc333 --- /dev/null +++ b/hydra/fpga.json @@ -0,0 +1,16 @@ +{ + "enabled": 1, + "hidden": true, + "description": "js", + "nixexprinput": "nixScripts", + "nixexprpath": "hydra/fpga.nix", + "checkinterval": 300, + "schedulingshares": 10, + "enableemail": false, + "emailoverride": "", + "keepnr": 10, + "inputs": { + "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-19.03", "emailresponsible": false }, + "nixScripts": { "type": "git", "value": "git://github.com/m-labs/nix-scripts.git", "emailresponsible": false } + } +} diff --git a/hydra/fpga.nix b/hydra/fpga.nix new file mode 100644 index 0000000..84369b1 --- /dev/null +++ b/hydra/fpga.nix @@ -0,0 +1,26 @@ +{ pkgs ? import {}}: +{ + jobsets = pkgs.runCommand "spec.json" {} + '' + cat > $out << EOF + { + "heavyx": { + "enabled": 1, + "hidden": false, + "description": "HeavyX SoC toolkit experiment", + "nixexprinput": "heavyx", + "nixexprpath": "default.nix", + "checkinterval": 300, + "schedulingshares": 10, + "enableemail": false, + "emailoverride": "", + "keepnr": 10, + "inputs": { + "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-19.03", "emailresponsible": false }, + "heavyx": { "type": "git", "value": "git://github.com/m-labs/heavyx.git", "emailresponsible": false } + } + } + } + EOF + ''; +} diff --git a/hydra/stm32.json b/hydra/stm32.json new file mode 100644 index 0000000..d12e309 --- /dev/null +++ b/hydra/stm32.json @@ -0,0 +1,16 @@ +{ + "enabled": 1, + "hidden": true, + "description": "js", + "nixexprinput": "nixScripts", + "nixexprpath": "hydra/stm32.nix", + "checkinterval": 300, + "schedulingshares": 10, + "enableemail": false, + "emailoverride": "", + "keepnr": 10, + "inputs": { + "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-18.09", "emailresponsible": false }, + "nixScripts": { "type": "git", "value": "git://github.com/m-labs/nix-scripts.git", "emailresponsible": false } + } +} diff --git a/hydra/stm32.nix b/hydra/stm32.nix new file mode 100644 index 0000000..ea746e1 --- /dev/null +++ b/hydra/stm32.nix @@ -0,0 +1,27 @@ +{ pkgs ? import {}}: +{ + jobsets = pkgs.runCommand "spec.json" {} + '' + cat > $out << EOF + { + "adc2tcp": { + "enabled": 1, + "hidden": false, + "description": "STM32 demo", + "nixexprinput": "adc2tcp", + "nixexprpath": "release.nix", + "checkinterval": 300, + "schedulingshares": 10, + "enableemail": false, + "emailoverride": "", + "keepnr": 10, + "inputs": { + "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-18.09", "emailresponsible": false }, + "adc2tcp": { "type": "git", "value": "git://github.com/m-labs/adc2tcp.git", "emailresponsible": false }, + "mozillaOverlay": { "type": "git", "value": "git://github.com/mozilla/nixpkgs-mozilla.git", "emailresponsible": false } + } + } + } + EOF + ''; +}