Update mac and mini labels

lsst-dm · Feb 20, 2025 · 36b7853 · 36b7853
1 parent 888ec68
commit 36b7853
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/seeds/dev-values.yaml b/seeds/dev-values.yaml
@@ -960,7 +960,7 @@ controller:
         jenkins:
           nodes:
             - permanent:
-                labelString: "osx-12"
+                labelString: "osx-12 osx-64"
                 launcher:
                   ssh:
                     credentialsId: "sqre-osx"
@@ -978,7 +978,7 @@ controller:
                 remoteFS: "/Users/squaredev/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "osx-12"
+                labelString: "osx-12 osx-64"
                 launcher:
                   ssh:
                     credentialsId: "sqre-osx"
@@ -996,7 +996,7 @@ controller:
                 remoteFS: "/Users/squaredev/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "osx-13"
+                labelString: "osx-13 osx-64"
                 launcher:
                   ssh:
                     credentialsId: "sqre-osx"
@@ -1014,7 +1014,7 @@ controller:
                 remoteFS: "/Users/squaredev/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "osx-13"
+                labelString: "osx-13 osx-64"
                 launcher:
                   ssh:
                     credentialsId: "sqre-osx"
@@ -1032,7 +1032,7 @@ controller:
                 remoteFS: "/Users/squaredev/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "osx-13"
+                labelString: "osx-13 osx-64"
                 launcher:
                   ssh:
                     credentialsId: "sqre-osx"
@@ -1050,7 +1050,7 @@ controller:
                 remoteFS: "/Users/squaredev/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "osx-13"
+                labelString: "osx-13 osx-64"
                 launcher:
                   ssh:
                     credentialsId: "sqre-osx"
@@ -1068,7 +1068,7 @@ controller:
                 remoteFS: "/Users/squaredev/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "mini"
+                labelString: "mini osx-arm64"
                 name: "mini01-dev"
                 launcher:
                   ssh:
@@ -1087,7 +1087,7 @@ controller:
                 remoteFS: "/Users/jenkinsdev/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "mini"
+                labelString: "mini osx-arm64"
                 name: "mini02-dev"
                 launcher:
                   ssh:
@@ -1106,7 +1106,7 @@ controller:
                 remoteFS: "/Users/jenkinsdev/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "mini"
+                labelString: "mini osx-arm64"
                 name: "mini03-dev"
                 launcher:
                   ssh:
@@ -1125,7 +1125,7 @@ controller:
                 remoteFS: "/Users/jenkinsdev/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "mini"
+                labelString: "mini osx-arm64"
                 name: "mini04-dev"
                 launcher:
                   ssh:
@@ -1144,7 +1144,7 @@ controller:
                 remoteFS: "/Users/jenkinsdev/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "mini"
+                labelString: "mini osx-arm64"
                 name: "mini05-dev"
                 launcher:
                   ssh:
@@ -1163,7 +1163,7 @@ controller:
                 remoteFS: "/Users/jenkinsdev/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "mini"
+                labelString: "mini osx-arm64"
                 name: "mini06-dev"
                 launcher:
                   ssh:

diff --git a/seeds/values.yaml b/seeds/values.yaml
@@ -937,7 +937,7 @@ controller:
         jenkins:
           nodes:
             - permanent:
-                labelString: "osx-12"
+                labelString: "osx-12 osx-64"
                 launcher:
                   ssh:
                     credentialsId: "sqre-osx"
@@ -955,7 +955,7 @@ controller:
                 remoteFS: "/Users/square/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "osx-12"
+                labelString: "osx-12 osx-64"
                 launcher:
                   ssh:
                     credentialsId: "sqre-osx"
@@ -973,7 +973,7 @@ controller:
                 remoteFS: "/Users/square/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "osx-13"
+                labelString: "osx-13 osx-64"
                 launcher:
                   ssh:
                     credentialsId: "sqre-osx"
@@ -991,7 +991,7 @@ controller:
                 remoteFS: "/Users/square/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "osx-13"
+                labelString: "osx-13 osx-64"
                 launcher:
                   ssh:
                     credentialsId: "sqre-osx"
@@ -1009,7 +1009,7 @@ controller:
                 remoteFS: "/Users/square/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "osx-13"
+                labelString: "osx-13 osx-64"
                 launcher:
                   ssh:
                     credentialsId: "sqre-osx"
@@ -1027,7 +1027,7 @@ controller:
                 remoteFS: "/Users/square/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "osx-13"
+                labelString: "osx-13 osx-64"
                 launcher:
                   ssh:
                     credentialsId: "sqre-osx"
@@ -1045,7 +1045,7 @@ controller:
                 remoteFS: "/Users/square/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "mini"
+                labelString: "mini osx-arm64"
                 name: "mini01"
                 launcher:
                   ssh:
@@ -1064,7 +1064,7 @@ controller:
                 remoteFS: "/Users/jenkins/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "mini"
+                labelString: "mini osx-arm64"
                 name: "mini02"
                 launcher:
                   ssh:
@@ -1083,7 +1083,7 @@ controller:
                 remoteFS: "/Users/jenkins/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "mini"
+                labelString: "mini osx-arm64"
                 name: "mini03"
                 launcher:
                   ssh:
@@ -1102,7 +1102,7 @@ controller:
                 remoteFS: "/Users/jenkins/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "mini"
+                labelString: "mini osx-arm64"
                 name: "mini04"
                 launcher:
                   ssh:
@@ -1121,7 +1121,7 @@ controller:
                 remoteFS: "/Users/jenkins/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "mini"
+                labelString: "mini osx-arm64"
                 name: "mini05"
                 launcher:
                   ssh:
@@ -1140,7 +1140,7 @@ controller:
                 remoteFS: "/Users/jenkins/j"
                 retentionStrategy: "always"
             - permanent:
-                labelString: "mini"
+                labelString: "mini osx-arm64"
                 name: "mini06"
                 launcher:
                   ssh: