summaryrefslogtreecommitdiffstats
path: root/jenkins-config/clouds
diff options
context:
space:
mode:
authorAndrew Grimberg <agrimberg@linuxfoundation.org>2023-08-29 16:41:31 -0700
committerAndrew Grimberg <agrimberg@linuxfoundation.org>2023-08-29 16:41:31 -0700
commitf4ba470bb5ca5aa54a6f42e83268c5c73af10179 (patch)
tree3c514badd219eae77ef0ba500a29d5c0c58b5840 /jenkins-config/clouds
parentd601742c45607a6959020393682a2543e8bbc127 (diff)
Test: Minor nomad changes to check scripts updates
Change-Id: Ifd01d73286bc155cfbba0ed6c321f005f1ce9f92 Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
Diffstat (limited to 'jenkins-config/clouds')
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64-jobtemplate.yaml2
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/jobtemplate-default.yaml1
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/main.yaml3
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml4
4 files changed, 6 insertions, 4 deletions
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: