Remove some more references to "production".
Change-Id: Iec9af51078c734754c9b7c7f8911a81878c9357d
diff --git a/jenkins/build_defs/bazel-job-Gerrit.xml.tpl b/jenkins/build_defs/bazel-job-Gerrit.xml.tpl
index dbfb81b..6602948 100644
--- a/jenkins/build_defs/bazel-job-Gerrit.xml.tpl
+++ b/jenkins/build_defs/bazel-job-Gerrit.xml.tpl
@@ -3,7 +3,7 @@
<actions/>
<description>Test Gerrit code review for {{ variables.PROJECT_NAME }}.
-This job for testing changes submitted to the Gerrit project: {{ variables.GERRIT_PROJECT }}.
+This job is for testing changes submitted to the Gerrit project: {{ variables.GERRIT_PROJECT }}.
</description>
<keepDependencies>false</keepDependencies>
<properties>
diff --git a/jenkins/build_defs/bazel-job-PR.xml.tpl b/jenkins/build_defs/bazel-job-PR.xml.tpl
index f8beb34..f7509ea 100644
--- a/jenkins/build_defs/bazel-job-PR.xml.tpl
+++ b/jenkins/build_defs/bazel-job-PR.xml.tpl
@@ -18,7 +18,6 @@
<com.coravy.hudson.plugins.github.GithubProjectProperty>
<projectUrl>{{ variables.GITHUB_URL }}</projectUrl>
</com.coravy.hudson.plugins.github.GithubProjectProperty>
- {% if variables.production == "true" %}
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
<org.jenkinsci.plugins.ghprb.GhprbTrigger>
@@ -55,7 +54,6 @@
</org.jenkinsci.plugins.ghprb.GhprbTrigger>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- {% endif %}
</properties>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps">
<script><![CDATA[
diff --git a/jenkins/build_defs/jenkins_job.bzl b/jenkins/build_defs/jenkins_job.bzl
index 3dff571..f3588fe 100644
--- a/jenkins/build_defs/jenkins_job.bzl
+++ b/jenkins/build_defs/jenkins_job.bzl
@@ -51,7 +51,6 @@
"GIT_URL": git_url,
"GITHUB_PROJECT": github_project,
"PROJECT_URL": project_url,
- "production": "true",
} + MAIL_SUBSTITUTIONS
substitutions["SEND_EMAIL"] = "1"
expand_template(
diff --git a/jenkins/build_defs/jenkins_nodes.bzl b/jenkins/build_defs/jenkins_nodes.bzl
index 223dc58..c8f45dc 100644
--- a/jenkins/build_defs/jenkins_nodes.bzl
+++ b/jenkins/build_defs/jenkins_nodes.bzl
@@ -16,7 +16,7 @@
load(":jenkins_node.bzl", "jenkins_node")
def jenkins_node_names(name, count):
- """Returns the names for `count` production jenkins node prefixed by `name`."""
+ """Returns the names for `count` jenkins nodes prefixed by `name`."""
return ["%s-%s" % (name, i) for i in range(1, count+1)]
def _extend_kwargs(kwargs, extra_args):
@@ -31,33 +31,29 @@
def jenkins_nodes(name,
count,
labels=None,
- prod_args=None,
install_bazel=True,
**kwargs):
"""Create a set of Jenkins nodes on the system.
- It creates `count` production nodes with name prefix `name`.
+ It creates `count` Jenkins nodes with name prefix `name`.
Example:
If `name` is `darwin-x86_64` and `count` is two, it will
- create two production nodes `darwin-x86_64-1` and `darwin-x86_64-2`.
+ create two nodes `darwin-x86_64-1` and `darwin-x86_64-2`.
Args:
name: prefix of each node name, it should be the platform
name (e.g., darwin-x86_64, ubuntu-14.04-x86_64, ...).
- count: number of production node to create.
+ count: number of nodes to create.
labels: Jenkins node labels to apply to this node (in addition to
the "install-bazel" label and the `name` itself).
- prod_args: dictionary of aditional arguments for production only
- nodes that will be passed to `jenkins_node`.
install_bazel: if the "install-bazel" label should be added to labels.
**kwargs: other arguments to be passed verbatim to `jenkins_node`.
"""
labels = [
name] + (["install-bazel"] if install_bazel else []) + (labels if labels else [])
- prod_kwargs = _extend_kwargs(kwargs, prod_args)
[jenkins_node(
name = n,
labels = labels,
- **prod_kwargs
+ **kwargs
) for n in jenkins_node_names(name, count)]
diff --git a/jenkins/gerrit-verifier.xml.tpl b/jenkins/gerrit-verifier.xml.tpl
index 0625423..fcfe377 100644
--- a/jenkins/gerrit-verifier.xml.tpl
+++ b/jenkins/gerrit-verifier.xml.tpl
@@ -13,7 +13,6 @@
</strategy>
</jenkins.model.BuildDiscarderProperty>
<org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
- {% if variables.production == "true" %}
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
<hudson.triggers.TimerTrigger>
@@ -21,7 +20,6 @@
</hudson.triggers.TimerTrigger>
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
- {% endif %}
</properties>
<assignedNode>deploy</assignedNode>
<definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps">
diff --git a/jenkins/jobs/global/nightly.xml.tpl b/jenkins/jobs/global/nightly.xml.tpl
index 0ae1215..a7bcae7 100644
--- a/jenkins/jobs/global/nightly.xml.tpl
+++ b/jenkins/jobs/global/nightly.xml.tpl
@@ -28,11 +28,9 @@
</hudson.model.ParametersDefinitionProperty>
<org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
<triggers>
- {% if variables.production == "true" %}
<hudson.triggers.TimerTrigger>
<spec>@midnight</spec>
</hudson.triggers.TimerTrigger>
- {% endif %}
</triggers>
</org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
</properties>
