diff options
12 files changed, 132 insertions, 5 deletions
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 88990b9e0..e4e359bed 100644 --- 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 3668cca3c..8d747dadc 100644 --- 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 10a1595af..ebf33b5f3 100644 --- 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 a48458d2e..f02460786 100644 --- 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 8b1dfe3d6..8816fcbf6 100644 --- 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 16d499a29..d899cfe05 100644 --- 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 52b5aec4e..dbe06362d 100644 --- 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 28e82e138..7a58ae88a 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: - - 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 cc8dac7eb..1baef1d70 100644 --- 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 bfabba617..10b0aca13 100644 --- 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 d49709e07..0bff740d4 100644 --- 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 f99da8621..86c7642df 100644 --- 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 |