Fix: Correct node defaults and sandbox nodes

Change-Id: I342ec75bd3c7e8de2dc6a33435ade63ac2c92351
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64-jobtemplate.yaml
index 88990b9..e4e359b 100644 (file)
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64-jobtemplate.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64-jobtemplate.yaml
@@ -5,7 +5,20 @@ Job:
       Tasks:
         - Name: jenkins-worker
           Config:
+            args:
+              - -cp
+              - /local/slave.jar
+              - hudson.remoting.jnlp.Main
+              - -headless
+              - -url
+              - https://jenkins.fd.io/sandbox
+              - -workDir
+              - /w/
+              - '%WORKER_SECRET%'
+              - '%WORKER_NAME%'
             image: fdiotools/builder-ubuntu2004:sandbox-aarch64
             volumes:
               - /tmp/ccache.ubuntu2004:/scratch/ccache
               - /scratch/nomad:/scratch/nomad:ro
+          Artifacts:
+            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64-jobtemplate.yaml
index 3668cca..8d747da 100644 (file)
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64-jobtemplate.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64-jobtemplate.yaml
@@ -12,7 +12,20 @@ Job:
       Tasks:
         - Name: jenkins-worker
           Config:
+            args:
+              - -cp
+              - /local/slave.jar
+              - hudson.remoting.jnlp.Main
+              - -headless
+              - -url
+              - https://jenkins.fd.io/sandbox
+              - -workDir
+              - /w/
+              - '%WORKER_SECRET%'
+              - '%WORKER_NAME%'
             image: fdiotools/builder-ubuntu2004:sandbox-x86_64
             volumes:
               - /tmp/ccache.ubuntu2004:/scratch/ccache
               - /scratch/nomad:/scratch/nomad:ro
+          Artifacts:
+            - GetterSource: https://jenkins.fd.io/jnlpJars/slave.jar

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml
index 10a1595..ebf33b5 100644 (file)
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml
@@ -5,7 +5,20 @@ Job:
       Tasks:
         - Name: jenkins-worker
           Config:
+            args:
+              - -cp
+              - /local/slave.jar
+              - hudson.remoting.jnlp.Main
+              - -headless
+              - -url
+              - https://jenkins.fd.io/sandbox
+              - -workDir
+              - /w/
+              - '%WORKER_SECRET%'
+              - '%WORKER_NAME%'
             image: fdiotools/builder-ubuntu2204:sandbox-aarch64
             volumes:
               - /tmp/ccache.ubuntu2204:/scratch/ccache
               - /scratch/nomad:/scratch/nomad:ro
+          Artifacts:
+            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml
index a48458d..f024607 100644 (file)
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml
@@ -12,7 +12,20 @@ Job:
       Tasks:
         - Name: jenkins-worker
           Config:
+            args:
+              - -cp
+              - /local/slave.jar
+              - hudson.remoting.jnlp.Main
+              - -headless
+              - -url
+              - https://jenkins.fd.io/sandbox
+              - -workDir
+              - /w/
+              - '%WORKER_SECRET%'
+              - '%WORKER_NAME%'
             image: fdiotools/builder-ubuntu2204:sandbox-x86_64
             volumes:
               - /tmp/ccache.ubuntu2204:/scratch/ccache
               - /scratch/nomad:/scratch/nomad:ro
+          Artifacts:
+            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml
index 8b1dfe3..8816fcb 100644 (file)
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml
@@ -12,7 +12,20 @@ Job:
       Tasks:
         - Name: jenkins-worker
           Config:
+            args:
+              - -cp
+              - /local/slave.jar
+              - hudson.remoting.jnlp.Main
+              - -headless
+              - -url
+              - https://jenkins.fd.io/sandbox
+              - -workDir
+              - /w/
+              - '%WORKER_SECRET%'
+              - '%WORKER_NAME%'
             image: fdiotools/builder-ubuntu2204:sandbox-aarch64
             volumes:
               - /tmp/ccache.ubuntu2204:/scratch/ccache
               - /scratch/nomad:/scratch/nomad:ro
+          Artifacts:
+            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml
index 16d499a..d899cfe 100644 (file)
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml
@@ -12,7 +12,20 @@ Job:
       Tasks:
         - Name: jenkins-worker
           Config:
+            args:
+              - -cp
+              - /local/slave.jar
+              - hudson.remoting.jnlp.Main
+              - -headless
+              - -url
+              - https://jenkins.fd.io/sandbox
+              - -workDir
+              - /w/
+              - '%WORKER_SECRET%'
+              - '%WORKER_NAME%'
             image: fdiotools/builder-ubuntu2204:sandbox-x86_64
             volumes:
               - /tmp/ccache.ubuntu2204:/scratch/ccache
               - /scratch/nomad:/scratch/nomad:ro
+          Artifacts:
+            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/jobtemplate-default.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/jobtemplate-default.yaml
index 52b5aec..dbe0636 100644 (file)
--- a/jenkins-config/clouds/nomad/FDIONOMAD/jobtemplate-default.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/jobtemplate-default.yaml
@@ -27,13 +27,13 @@ Job:
               - hudson.remoting.jnlp.Main
               - -headless
               - -url
-              - https://jenkins.fd.io/sandbox
+              - https://jenkins.fd.io
               - -workDir
               - /w/
               - '%WORKER_SECRET%'
               - '%WORKER_NAME%'
             privileged: true
-            image: fdiotools/builder-ubuntu2204:sandbox-aarch64
+            image: fdiotools/builder-ubuntu2204:prod-aarch64
             auth:
               - password: hidden
                 username: fdionomad

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 28e82e1..7a58ae8 100644 (file)
--- 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:
-  - CPU: 8000
-    MemoryMB: 8192
-    labels: "m-builder-ubuntu2204-prod-x86_64"
+  - labels: "m-builder-ubuntu2204-prod-x86_64"
     prefix: "m-builder-ubuntu2204-prod-x86_64"

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml
index cc8dac7..1baef1d 100644 (file)
--- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml
@@ -6,6 +6,16 @@ Job:
         - Name: jenkins-worker
           Config:
             args:
+              - -cp
+              - /local/slave.jar
+              - hudson.remoting.jnlp.Main
+              - -headless
+              - -url
+              - https://jenkins.fd.io/sandbox
+              - -workDir
+              - /w/
+              - '%WORKER_SECRET%'
+              - '%WORKER_NAME%'
             image: fdiotools/builder-ubuntu2204:sandbox-aarch64
             volumes:
               - /tmp/ccache.ubuntu2204:/scratch/ccache
@@ -13,3 +23,5 @@ Job:
           Resources:
             CPU: 8000
             MemoryMB: 8192
+          Artifacts:
+            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml
index bfabba6..10b0aca 100644 (file)
--- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml
@@ -12,6 +12,17 @@ Job:
       Tasks:
         - Name: jenkins-worker
           Config:
+            args:
+              - -cp
+              - /local/slave.jar
+              - hudson.remoting.jnlp.Main
+              - -headless
+              - -url
+              - https://jenkins.fd.io/sandbox
+              - -workDir
+              - /w/
+              - '%WORKER_SECRET%'
+              - '%WORKER_NAME%'
             image: fdiotools/builder-ubuntu2204:sandbox-x86_64
             volumes:
               - /tmp/ccache.ubuntu2204:/scratch/ccache
@@ -19,3 +30,5 @@ Job:
           Resources:
             CPU: 8000
             MemoryMB: 8192
+          Artifacts:
+            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml
index d49709e..0bff740 100644 (file)
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64-jobtemplate.yaml
@@ -5,6 +5,17 @@ Job:
       Tasks:
         - Name: jenkins-worker
           Config:
+            args:
+              - -cp
+              - /local/slave.jar
+              - hudson.remoting.jnlp.Main
+              - -headless
+              - -url
+              - https://jenkins.fd.io/sandbox
+              - -workDir
+              - /w/
+              - '%WORKER_SECRET%'
+              - '%WORKER_NAME%'
             image: fdiotools/builder-ubuntu2204:sandbox-aarch64
             volumes:
               - /tmp/ccache.ubuntu2204:/scratch/ccache
@@ -12,3 +23,5 @@ Job:
           Resources:
             CPU: 4000
             MemoryMB: 4096
+          Artifacts:
+            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml
index f99da86..86c7642 100644 (file)
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64-jobtemplate.yaml
@@ -12,6 +12,17 @@ Job:
       Tasks:
         - Name: jenkins-worker
           Config:
+            args:
+              - -cp
+              - /local/slave.jar
+              - hudson.remoting.jnlp.Main
+              - -headless
+              - -url
+              - https://jenkins.fd.io/sandbox
+              - -workDir
+              - /w/
+              - '%WORKER_SECRET%'
+              - '%WORKER_NAME%'
             image: fdiotools/builder-ubuntu2204:sandbox-x86_64
             volumes:
               - /tmp/ccache.ubuntu2204:/scratch/ccache
@@ -19,3 +30,5 @@ Job:
           Resources:
             CPU: 4000
             MemoryMB: 4096
+          Artifacts:
+            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar