From 19accfd398e843879475cf70873f7ab52967a7c2 Mon Sep 17 00:00:00 2001 From: Aric Gardner Date: Tue, 19 Jan 2021 14:32:36 -0500 Subject: Need to differentiate sandbox and main jenkins servers have unique nomad configs Signed-off-by: Aric Gardner Change-Id: I852bad31fc35b20fd37311779a38c013197f4312 --- jenkins-config/clouds/nomad/FDIONOMAD/cloud.yaml | 13 ------------- jenkins-config/clouds/nomad/FDIONOMAD/main.yaml | 13 +++++++++++++ jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml | 13 +++++++++++++ 3 files changed, 26 insertions(+), 13 deletions(-) delete mode 100644 jenkins-config/clouds/nomad/FDIONOMAD/cloud.yaml create mode 100644 jenkins-config/clouds/nomad/FDIONOMAD/main.yaml create mode 100644 jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/cloud.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/cloud.yaml deleted file mode 100644 index ca90d3148..000000000 --- a/jenkins-config/clouds/nomad/FDIONOMAD/cloud.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -jenkins: - clouds: - - nomad: - jenkinsUrl: "https://jenkins.fd.io/" - name: "FDIONOMAD" - nomadUrl: "http://10.30.51.32:4646" - jenkinsTunnel: "" - prune: false - nomadACLCredentialsId: "" - workerTimeout: 5 - workerUrl: "https://jenkins.fd.io/jnlpJars/slave.jar" - templates: diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/main.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/main.yaml new file mode 100644 index 000000000..ca90d3148 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/main.yaml @@ -0,0 +1,13 @@ +--- +jenkins: + clouds: + - nomad: + jenkinsUrl: "https://jenkins.fd.io/" + name: "FDIONOMAD" + nomadUrl: "http://10.30.51.32:4646" + jenkinsTunnel: "" + prune: false + nomadACLCredentialsId: "" + workerTimeout: 5 + workerUrl: "https://jenkins.fd.io/jnlpJars/slave.jar" + templates: diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml new file mode 100644 index 000000000..45dd5e0f0 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml @@ -0,0 +1,13 @@ +--- +jenkins: + clouds: + - nomad: + jenkinsUrl: "https://jenkins.fd.io/sandbox" + name: "FDIONOMAD" + nomadUrl: "http://10.30.51.32:4646" + jenkinsTunnel: "" + prune: false + nomadACLCredentialsId: "" + workerTimeout: 5 + workerUrl: "https://jenkins.fd.io/sandbox/jnlpJars/slave.jar" + templates: -- cgit 1.2.3-korg