From 365877d01f7e5b9a8d587455916116dac1c9cea4 Mon Sep 17 00:00:00 2001 From: Vanessa Valderrama Date: Tue, 5 Dec 2023 11:53:46 -0600 Subject: Fix: Configure labels based on environment Configuring the node labels based on sandbox or production to resolve JCasC cron failures Change-Id: I94bb55dc9f47b93bb0698e78b4e0266497eda4f2 Signed-off-by: Vanessa Valderrama --- .../clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml | 4 +--- .../nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml | 4 +--- .../nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64.yaml | 4 +--- .../clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64.yaml | 4 +--- 22 files changed, 22 insertions(+), 66 deletions(-) diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml index bd8656a03..3c219a2f6 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "builder-debian11-prod-x86_64" - labels: - - "builder-debian11-prod-x86_64" - - "builder-debian11-sandbox-x86_64" + labels: "builder-debian11-prod-x86_64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml index 50ca41a7e..029f44eee 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "builder-debian11-sandbox-x86_64" - labels: - - "builder-debian11-sandbox-x86_64" - - "builder-debian11-prod-x86_64" + labels: "builder-debian11-sandbox-x86_64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml index 1847c83f2..0643191a0 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "builder-ubuntu2004-prod-aarch64" - labels: - - "builder-ubuntu2004-prod-aarch64" - - "builder-ubuntu2004-sandbox-aarch64" + labels: "builder-ubuntu2004-prod-aarch64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml index 0ec9d08ca..5e6a7669d 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "builder-ubuntu2004-prod-x86_64" - labels: - - "builder-ubuntu2004-prod-x86_64" - - "builder-ubuntu2004-sandbox-x86_64" + labels: "builder-ubuntu2004-prod-x86_64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml index ce57a85e6..3998c53bb 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "builder-ubuntu2004-sandbox-aarch64" - labels: - - "builder-ubuntu2004-sandbox-aarch64" - - "builder-ubuntu2004-prod-aarch64" + labels: "builder-ubuntu2004-sandbox-aarch64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml index e09d0bbf1..0afdb7b1d 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "builder-ubuntu2004-sandbox-x86_64" - labels: - - "builder-ubuntu2004-sandbox-x86_64" - - "builder-ubuntu2004-prod-x86_64" + labels: "builder-ubuntu2004-sandbox-x86_64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml index 10affd3ec..aa6ee23e8 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "builder-ubuntu2204-prod-aarch64" - labels: - - "builder-ubuntu2204-prod-aarch64" - - "builder-ubuntu2204-sandbox-aarch64" + labels: "builder-ubuntu2204-prod-aarch64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml index d8dbba080..b9ca4d3e4 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "builder-ubuntu2204-prod-x86_64" - labels: - - "builder-ubuntu2204-prod-x86_64" - - "builder-ubuntu2204-sandbox-x86_64" + labels: "builder-ubuntu2204-prod-x86_64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml index 8d225d13f..4eb5d7d3b 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "builder-ubuntu2204-sandbox-aarch64" - labels: - - "builder-ubuntu2204-sandbox-aarch64" - - "builder-ubuntu2204-prod-aarch64" + labels: "builder-ubuntu2204-sandbox-aarch64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml index 07486e910..5a225e2b3 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "builder-ubuntu2204-sandbox-x86_64" - labels: - - "builder-ubuntu2204-sandbox-x86_64" - - "builder-ubuntu2204-prod-x86_64" + labels: "builder-ubuntu2204-sandbox-x86_64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml index 41ecf0542..9c9324eca 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "csit-builder-ubuntu2204-prod-aarch64" - labels: - - "csit-builder-ubuntu2204-prod-aarch64" - - "csit-builder-ubuntu2204-sandbox-aarch64" + labels: "csit-builder-ubuntu2204-prod-aarch64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml index 7146226e8..492353a58 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "csit-builder-ubuntu2204-prod-x86_64" - labels: - - "csit-builder-ubuntu2204-prod-x86_64" - - "csit-builder-ubuntu2204-sandbox-x86_64" + labels: "csit-builder-ubuntu2204-prod-x86_64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml index 309783489..03e458795 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "csit-builder-ubuntu2204-sandbox-aarch64" - labels: - - "csit-builder-ubuntu2204-sandbox-aarch64" - - "csit-builder-ubuntu2204-prod-aarch64" + labels: "csit-builder-ubuntu2204-sandbox-aarch64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml index 49b404f05..2390750cc 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "csit-builder-ubuntu2204-sandbox-x86_64" - labels: - - "csit-builder-ubuntu2204-sandbox-x86_64" - - "csit-builder-ubuntu2204-prod-x86_64" + labels: "csit-builder-ubuntu2204-sandbox-x86_64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml index debdf4bac..c145f630c 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "m-builder-ubuntu2204-prod-aarch64" - labels: - - "m-builder-ubuntu2204-prod-aarch64" - - "m-builder-ubuntu2204-sandbox-aarch64" + labels: "m-builder-ubuntu2204-prod-aarch64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml index de6701e11..474b8818c 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "m-builder-ubuntu2204-prod-x86_64" - labels: - - "m-builder-ubuntu2204-prod-x86_64" - - "m-builder-ubuntu2204-sandbox-x86_64" + labels: "m-builder-ubuntu2204-prod-x86_64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml index 163ea988e..b5cba5d9f 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "m-builder-ubuntu2204-sandbox-aarch64" - labels: - - "m-builder-ubuntu2204-sandbox-aarch64" - - "m-builder-ubuntu2204-prod-aarch64" + labels: "m-builder-ubuntu2204-sandbox-aarch64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml index b989e7048..0c6b42392 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "m-builder-ubuntu2204-sandbox-x86_64" - labels: - - "m-builder-ubuntu2204-sandbox-x86_64" - - "m-builder-ubuntu2204-prod-x86_64" + labels: "m-builder-ubuntu2204-sandbox-x86_64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64.yaml index f280dbefd..2bbf4f621 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "s-builder-ubuntu2204-prod-aarch64" - labels: - - "s-builder-ubuntu2204-prod-aarch64" - - "s-builder-ubuntu2204-sandbox-aarch64" + labels: "s-builder-ubuntu2204-prod-aarch64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64.yaml index 9e9f4ddb5..74c40ec61 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "s-builder-ubuntu2204-prod-x86_64" - labels: - - "s-builder-ubuntu2204-prod-x86_64" - - "s-builder-ubuntu2204-sandbox-x86_64" + labels: "s-builder-ubuntu2204-prod-x86_64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64.yaml index 7999e9ac6..624b14d1a 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "s-builder-ubuntu2204-sandbox-aarch64" - labels: - - "s-builder-ubuntu2204-sandbox-aarch64" - - "s-builder-ubuntu2204-prod-aarch64" + labels: "s-builder-ubuntu2204-sandbox-aarch64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64.yaml index be378fe77..278a50512 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64.yaml @@ -1,6 +1,4 @@ --- templates: - prefix: "s-builder-ubuntu2204-sandbox-x86_64" - labels: - - "s-builder-ubuntu2204-sandbox-x86_64" - - "s-builder-ubuntu2204-prod-x86_64" + labels: "s-builder-ubuntu2204-sandbox-x86_64" -- cgit 1.2.3-korg