From c590df48e0553a670e18ebf9d02047bfcfddb40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Bourdeauducq?= Date: Thu, 6 Jun 2024 10:54:31 +0800 Subject: [PATCH] ARTIQ release 8 Hydra settings --- hydra/artiq.json | 73 +++++++++++++----------------------------------- 1 file changed, 19 insertions(+), 54 deletions(-) diff --git a/hydra/artiq.json b/hydra/artiq.json index 8231884..fdd025e 100644 --- a/hydra/artiq.json +++ b/hydra/artiq.json @@ -66,7 +66,7 @@ "type": 1, "hidden": false, "description": "Main ARTIQ packages (stable version)", - "flake": "git+https://github.com/m-labs/artiq.git?ref=release-7", + "flake": "git+https://github.com/m-labs/artiq.git?ref=release-8", "checkinterval": 300, "schedulingshares": 10, "enableemail": false, @@ -78,7 +78,7 @@ "type": 1, "hidden": false, "description": "Additional ARTIQ packages (stable version)", - "flake": "git+https://git.m-labs.hk/m-labs/artiq-extrapkg.git?ref=release-7", + "flake": "git+https://git.m-labs.hk/m-labs/artiq-extrapkg.git?ref=release-8", "checkinterval": 300, "schedulingshares": 10, "enableemail": false, @@ -90,7 +90,7 @@ "type": 1, "hidden": false, "description": "ARTIQ on Zynq-7000 (stable version)", - "flake": "git+https://git.m-labs.hk/m-labs/artiq-zynq.git?ref=release-7", + "flake": "git+https://git.m-labs.hk/m-labs/artiq-zynq.git?ref=release-8", "checkinterval": 300, "schedulingshares": 10, "enableemail": false, @@ -98,76 +98,41 @@ "keepnr": 50 }, - "fast-legacy": { + "main-legacy": { "enabled": 1, + "type": 1, "hidden": false, - "description": "Core ARTIQ packages to build fast for CI purposes (legacy version)", - "nixexprinput": "nixScripts", - "nixexprpath": "artiq-fast.nix", + "description": "Main ARTIQ packages (legacy version)", + "flake": "git+https://github.com/m-labs/artiq.git?ref=release-7", "checkinterval": 300, "schedulingshares": 10, "enableemail": false, "emailoverride": "", - "keepnr": 50, - "inputs": { - "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.05", "emailresponsible": false }, - "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, - "artiqSrc": { "type": "git", "value": "https://github.com/m-labs/artiq.git release-6 1", "emailresponsible": false } - } + "keepnr": 50 }, - "board-generated-legacy": { + "extra-legacy": { "enabled": 1, + "type": 1, "hidden": false, - "description": "Generated code for ARTIQ boards (legacy version)", - "nixexprinput": "nixScripts", - "nixexprpath": "artiq-board-generated", - "checkinterval": 14400, - "schedulingshares": 1, + "description": "Additional ARTIQ packages (legacy version)", + "flake": "git+https://git.m-labs.hk/m-labs/artiq-extrapkg.git?ref=release-7", + "checkinterval": 300, + "schedulingshares": 10, "enableemail": false, "emailoverride": "", - "keepnr": 50, - "inputs": { - "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.05", "emailresponsible": false }, - "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, - "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems-legacy.git master 1", "emailresponsible": false }, - "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-legacy:generated-nix", "emailresponsible": false } - } - }, - "full-legacy": { - "enabled": 1, - "hidden": false, - "description": "Full set of ARTIQ packages (legacy version)", - "nixexprinput": "nixScripts", - "nixexprpath": "artiq-full.nix", - "checkinterval": 86400, - "schedulingshares": 1, - "enableemail": false, - "emailoverride": "", - "keepnr": 50, - "inputs": { - "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.05", "emailresponsible": false }, - "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, - "use-generated": { "type": "boolean", "value": "true" }, - "artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated-legacy:generated-nix", "emailresponsible": false } - } + "keepnr": 50 }, "zynq-legacy": { "enabled": 1, + "type": 1, "hidden": false, "description": "ARTIQ on Zynq-7000 (legacy version)", - "nixexprinput": "nixScripts", - "nixexprpath": "artiq-zynq.nix", + "flake": "git+https://git.m-labs.hk/m-labs/artiq-zynq.git?ref=release-7", "checkinterval": 300, - "schedulingshares": 1, + "schedulingshares": 10, "enableemail": false, "emailoverride": "", - "keepnr": 50, - "inputs": { - "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.05", "emailresponsible": false }, - "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, - "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-legacy:generated-nix", "emailresponsible": false }, - "artiq-zynq": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/artiq-zynq.git release-6", "emailresponsible": false } - } + "keepnr": 50 }, "gluelogic": {