From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Tue, 29 Aug 2023 23:41:31 +0000 (-0700)
Subject: Test: Minor nomad changes to check scripts updates
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=f4ba470bb5ca5aa54a6f42e83268c5c73af10179;p=ci-management.git

Test: Minor nomad changes to check scripts updates

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

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64-jobtemplate.yaml
index f41b11eb9..9b3ab59e0 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64-jobtemplate.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64-jobtemplate.yaml
@@ -16,3 +16,5 @@ Job:
             volumes:
               - /tmp/ccache.debian11:/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 10cb71643..52b5aec4e 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/jobtemplate-default.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/jobtemplate-default.yaml
@@ -54,6 +54,7 @@ Job:
             MaxFiles: 1
             MaxFileSizeMB: 10
           Artifacts:
+            - GetterSource: https://jenkins.fd.io/jnlpJars/slave.jar
             - RelativeDest: /local/
       RestartPolicy:
         Interval: 10000000000
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/main.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/main.yaml
index 5fe65b089..65434f3ce 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/main.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/main.yaml
@@ -2,10 +2,9 @@
 jenkins:
   clouds:
     - nomad:
-        url: "https://jenkins.fd.io/"
         name: "FDIONOMAD"
         nomadUrl: "http://10.30.51.23:4646"
         prune: "false"
         workerTimeout: 5
-        GetterSource: "https://jenkins.fd.io/jnlpJars/slave.jar"
+        tlsEnabled: false
         templates:
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml
index f46e09bf4..65434f3ce 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml
@@ -2,9 +2,9 @@
 jenkins:
   clouds:
     - nomad:
-        url: "https://jenkins.fd.io/sandbox"
         name: "FDIONOMAD"
         nomadUrl: "http://10.30.51.23:4646"
+        prune: "false"
         workerTimeout: 5
-        GetterSource: "https://jenkins.fd.io/sandbox/jnlpJars/slave.jar"
+        tlsEnabled: false
         templates: