commit af559b8c7a17e19ded53d130d41f35f34c9e939f
author Philipp Wollermann <philwo@google.com> Thu Jan 18 13:05:57 2018 +0100
committer Philipp Wollermann <philwo@google.com> Sun Feb 04 14:22:49 2018 +0100
tree 75f4252ea2e9deaf7002981a96fac2fe8d77be29
parent 1bd86114f6eb1f50f0f043e8fa65c249d2ac2ac9

Remove some templated variables that were only set and used once.

Change-Id: I4635cb2ae419bc2ab70b18073b83b18bf2a38af1

jenkins/BUILD

diff --git a/jenkins/BUILD b/jenkins/BUILD
index b8f1223..0223234 100644
--- a/jenkins/BUILD
+++ b/jenkins/BUILD
@@ -234,9 +234,6 @@
         "//jenkins/jobs",
         ":maintenance/gerrit-verifier",
     ],
-    substitutions = {
-        "PUBLIC_JENKINS_URL": "https://ci.bazel.build/",
-    },
     tars = ["//jenkins/lib"],
     visibility = ["//visibility:public"],
 )

jenkins/build_defs/vars.bzl

diff --git a/jenkins/build_defs/vars.bzl b/jenkins/build_defs/vars.bzl
index 5d4fe3b..3203bf3 100644
--- a/jenkins/build_defs/vars.bzl
+++ b/jenkins/build_defs/vars.bzl
@@ -17,5 +17,4 @@
 MAIL_SUBSTITUTIONS = {
     "BAZEL_BUILD_RECIPIENT": "bazel-ci@googlegroups.com",
     "BAZEL_RELEASE_RECIPIENT": "bazel-discuss+release@googlegroups.com",
-    "SENDER_EMAIL": "noreply@bazel.build",
 }

jenkins/config/jenkins.model.JenkinsLocationConfiguration.xml.tpl

diff --git a/jenkins/config/jenkins.model.JenkinsLocationConfiguration.xml.tpl b/jenkins/config/jenkins.model.JenkinsLocationConfiguration.xml.tpl
index 241d772..6482442 100644
--- a/jenkins/config/jenkins.model.JenkinsLocationConfiguration.xml.tpl
+++ b/jenkins/config/jenkins.model.JenkinsLocationConfiguration.xml.tpl
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--
   Copyright 2015 The Bazel Authors. All rights reserved.
- 
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
- 
+
      http://www.apache.org/licenses/LICENSE-2.0
- 
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,6 +15,6 @@
   limitations under the License.
 -->
 <jenkins.model.JenkinsLocationConfiguration>
-  <adminAddress>Bazel Jenkins CI server &lt;{{ variables.SENDER_EMAIL }}&gt;</adminAddress>
-  <jenkinsUrl>{{ variables.PUBLIC_JENKINS_URL }}</jenkinsUrl>
+  <adminAddress>Bazel Jenkins CI server &lt;noreply@bazel.build&gt;</adminAddress>
+  <jenkinsUrl>https://ci.bazel.build/</jenkinsUrl>
 </jenkins.model.JenkinsLocationConfiguration>