Adopt modern Jenkins terminology for build agents

The Jenkins terminology has been updated over a year
ago (see [1]) and it is time to align all our images
and builds to the new and more respectful term of agent
to refer to build workers.

[1] https://www.jenkins.io/blog/2020/06/18/terminology-update/

Change-Id: I8e9246f6d06d2a93d5ab612843fc41b41e47ccf3
diff --git a/jenkins-docker/Makefile b/jenkins-docker/Makefile
index 2430dbd..0cdf3c3 100644
--- a/jenkins-docker/Makefile
+++ b/jenkins-docker/Makefile
@@ -1,5 +1,5 @@
-SLAVE_DIRS ?= slave-debian slave-chrome slave-node-wct slave-bazel-nocache slave-bazel slave-bazel-docker slave-sbt slave-mvn slave-release slave-python3 slave-jekyll slave-aws
-ALL_DIRS ?= master bazel-cache $(SLAVE_DIRS)
+AGENT_DIRS ?= agent-debian agent-chrome agent-node-wct agent-bazel-nocache agent-bazel agent-bazel-docker agent-sbt agent-mvn agent-release agent-python3 agent-jekyll agent-aws
+ALL_DIRS ?= master bazel-cache $(AGENT_DIRS)
 NO_CACHE ?= true
 
 default: build
@@ -7,8 +7,8 @@
 build clean publish:
 	for dir in $(ALL_DIRS); do (make NO_CACHE=$(NO_CACHE) -C $$dir $@) || exit 1; done
 
-publish_slave:
-	for dir in $(SLAVE_DIRS); do (make NO_CACHE=$(NO_CACHE) -C $$dir build publish) || exit 1; done
+publish_agent:
+	for dir in $(AGENT_DIRS); do (make NO_CACHE=$(NO_CACHE) -C $$dir build publish) || exit 1; done
 
 start stop restart:
 	make -C master $@
diff --git a/jenkins-docker/README.md b/jenkins-docker/README.md
index 1517d7d..aa72340 100644
--- a/jenkins-docker/README.md
+++ b/jenkins-docker/README.md
@@ -37,15 +37,15 @@
 
 Images available are:
 
-* gerritforge/gerrit-ci-slave: Base Jenkins slave with OS and prerequisites.
+* gerritforge/gerrit-ci-agent: Base Jenkins agent with OS and prerequisites.
 
-* gerritforge/gerrit-ci-slave-debian: Base Jenkins slave with OS and prerequisites.
+* gerritforge/gerrit-ci-agent-debian: Base Jenkins agent with OS and prerequisites.
 
-* gerritforge/gerrit-ci-slave-bazel: Bazel build for gerrit 2.14+.
+* gerritforge/gerrit-ci-agent-bazel: Bazel build for gerrit 2.14+.
 
-* gerritforge/gerrit-ci-slave-bazel-sbt: Setups scala for plugins that use scala.
+* gerritforge/gerrit-ci-agent-bazel-sbt: Setups scala for plugins that use scala.
 
-* gerritforge/gerrit-ci-slave-mvn - Setups maven for plugins that use maven.
+* gerritforge/gerrit-ci-agent-mvn - Setups maven for plugins that use maven.
 
 ## Running the container
 
@@ -53,7 +53,7 @@
 
 If your not familar with docker please follow https://docs.docker.com/get-started/
 
-## Contributing slave to Gerrit Code Review verification
+## Contributing agent to Gerrit Code Review verification
 
 * Set up root server with running docker service.
 * Generate ecdsa SSH key and send public key to CI maintainer:
@@ -62,10 +62,10 @@
   $ ssh-keygen -t ecdsa -b 521
 ----
 
-* Ask CI maintainer to generate for you unique slave id.
+* Ask CI maintainer to generate for you unique agent id.
 
 * Run `cat /proc/cpuinfo` and report CI maintainer the number of CPUs, so
-that your slave would not get overloaded.
+that your agent would not get overloaded.
 
 * Clone gerrit-ci-scripts repository:
 
@@ -97,21 +97,21 @@
   $ systemctl restart docker.service
 ----
 
-* Add this line to crontab job (replace <your_slave_id>):
+* Add this line to crontab job (replace <your_agent_id>):
 
 ----
-*/5 * * * * /root/gerrit-ci-scripts/worker/tunnel.sh <your_slave_id>
+*/5 * * * * /root/gerrit-ci-scripts/worker/tunnel.sh <your_agent_id>
 ----
 
 * In case your server is behind a Firewall, open tcp/2375 port for
 incoming requests.
 
 * Check on https://gerrit-ci.gerritforge.com and running `docker ps`
-that your slave is up and running and build jobs are scheduled. If all
+that your agent is up and running and build jobs are scheduled. If all
 went well and when jobs have arrived you should see something like:
 
 ----
   $ docker ps
   CONTAINER ID        IMAGE                                    COMMAND                  CREATED             STATUS              PORTS
-  d9ff4b6a8b1c        gerritforge/jenkins-slave-bazel:debian   "bash -x /bin/star..."   6 minutes ago       Up 6 minutes        0.0.0.0:32792->22/tcp
+  d9ff4b6a8b1c        gerritforge/jenkins-agent-bazel:debian   "bash -x /bin/star..."   6 minutes ago       Up 6 minutes        0.0.0.0:32792->22/tcp
 ----
diff --git a/jenkins-docker/slave-aws/Dockerfile b/jenkins-docker/agent-aws/Dockerfile
similarity index 90%
rename from jenkins-docker/slave-aws/Dockerfile
rename to jenkins-docker/agent-aws/Dockerfile
index 26206e5..3baac1b 100644
--- a/jenkins-docker/slave-aws/Dockerfile
+++ b/jenkins-docker/agent-aws/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-debian:buster
+FROM gerritforge/gerrit-ci-agent-debian:buster
 
 RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" \ 
  && unzip awscliv2.zip && ./aws/install
diff --git a/jenkins-docker/slave-aws/Makefile b/jenkins-docker/agent-aws/Makefile
similarity index 84%
rename from jenkins-docker/slave-aws/Makefile
rename to jenkins-docker/agent-aws/Makefile
index 3f4a84c..6828932 100644
--- a/jenkins-docker/slave-aws/Makefile
+++ b/jenkins-docker/agent-aws/Makefile
@@ -1,6 +1,6 @@
 NO_CACHE=false
 PREFIX=gerritforge
-IMAGE=${PREFIX}/gerrit-ci-slave-aws
+IMAGE=${PREFIX}/gerrit-ci-agent-aws
 
 # Targets
 
diff --git a/jenkins-docker/slave-bazel-docker/Dockerfile b/jenkins-docker/agent-bazel-docker/Dockerfile
similarity index 88%
rename from jenkins-docker/slave-bazel-docker/Dockerfile
rename to jenkins-docker/agent-bazel-docker/Dockerfile
index 1ef3429..c021e9e 100644
--- a/jenkins-docker/slave-bazel-docker/Dockerfile
+++ b/jenkins-docker/agent-bazel-docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-bazel:debian-buster-$CHROME_VER
+FROM gerritforge/gerrit-ci-agent-bazel:debian-buster-$CHROME_VER
 
 RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
     add-apt-repository \
diff --git a/jenkins-docker/slave-bazel-docker/Makefile b/jenkins-docker/agent-bazel-docker/Makefile
similarity index 90%
rename from jenkins-docker/slave-bazel-docker/Makefile
rename to jenkins-docker/agent-bazel-docker/Makefile
index ab3bc4d..f613d12 100644
--- a/jenkins-docker/slave-bazel-docker/Makefile
+++ b/jenkins-docker/agent-bazel-docker/Makefile
@@ -2,7 +2,7 @@
 
 NO_CACHE=false
 PREFIX=gerritforge
-IMAGE=${PREFIX}/gerrit-ci-slave-bazel-docker:debian-buster
+IMAGE=${PREFIX}/gerrit-ci-agent-bazel-docker:debian-buster
 
 # Targets
 
diff --git a/jenkins-docker/slave-bazel-nocache/Dockerfile b/jenkins-docker/agent-bazel-nocache/Dockerfile
similarity index 94%
rename from jenkins-docker/slave-bazel-nocache/Dockerfile
rename to jenkins-docker/agent-bazel-nocache/Dockerfile
index 2e7de79..02c8885 100644
--- a/jenkins-docker/slave-bazel-nocache/Dockerfile
+++ b/jenkins-docker/agent-bazel-nocache/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-node-wct:$NODE_VER-$WCT_VER-$CHROME_VER
+FROM gerritforge/gerrit-ci-agent-node-wct:$NODE_VER-$WCT_VER-$CHROME_VER
 
 ARG BAZEL_VER
 ARG BUILDIFIER_VER
diff --git a/jenkins-docker/slave-bazel-nocache/Makefile b/jenkins-docker/agent-bazel-nocache/Makefile
similarity index 92%
rename from jenkins-docker/slave-bazel-nocache/Makefile
rename to jenkins-docker/agent-bazel-nocache/Makefile
index 5e37d47..1086c07 100644
--- a/jenkins-docker/slave-bazel-nocache/Makefile
+++ b/jenkins-docker/agent-bazel-nocache/Makefile
@@ -2,7 +2,7 @@
 
 NO_CACHE=false
 PREFIX=gerritforge
-IMAGE=${PREFIX}/gerrit-ci-slave-bazel:debian-buster-nocache
+IMAGE=${PREFIX}/gerrit-ci-agent-bazel:debian-buster-nocache
 BAZEL_VER=4.0.0
 BUILDIFIER_VER=4.0.0
 BAZELISK_VER=1.7.4
diff --git a/jenkins-docker/slave-bazel/Dockerfile b/jenkins-docker/agent-bazel/Dockerfile
similarity index 92%
rename from jenkins-docker/slave-bazel/Dockerfile
rename to jenkins-docker/agent-bazel/Dockerfile
index 936677a..1ad5acf 100644
--- a/jenkins-docker/slave-bazel/Dockerfile
+++ b/jenkins-docker/agent-bazel/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-bazel:debian-buster-nocache-$CHROME_VER
+FROM gerritforge/gerrit-ci-agent-bazel:debian-buster-nocache-$CHROME_VER
 
 # Bazel cache warm-up with Gerrit master and latest stable branch.
 # Set-up google-java-format utility to ~/format/google-java-format.
diff --git a/jenkins-docker/slave-bazel/Makefile b/jenkins-docker/agent-bazel/Makefile
similarity index 91%
rename from jenkins-docker/slave-bazel/Makefile
rename to jenkins-docker/agent-bazel/Makefile
index 0da3add..61205af 100644
--- a/jenkins-docker/slave-bazel/Makefile
+++ b/jenkins-docker/agent-bazel/Makefile
@@ -2,7 +2,7 @@
 
 NO_CACHE=false
 PREFIX=gerritforge
-IMAGE=${PREFIX}/gerrit-ci-slave-bazel:debian-buster
+IMAGE=${PREFIX}/gerrit-ci-agent-bazel:debian-buster
 
 # Targets
 
diff --git a/jenkins-docker/slave-chrome/Dockerfile b/jenkins-docker/agent-chrome/Dockerfile
similarity index 92%
rename from jenkins-docker/slave-chrome/Dockerfile
rename to jenkins-docker/agent-chrome/Dockerfile
index de44760..a8dbed7 100644
--- a/jenkins-docker/slave-chrome/Dockerfile
+++ b/jenkins-docker/agent-chrome/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-debian:$DEBIAN_VER
+FROM gerritforge/gerrit-ci-agent-debian:$DEBIAN_VER
 
 RUN sed -i -e 's/archive/old-releases/g' /etc/apt/sources.list && \
     apt-get update --allow-releaseinfo-change && \
diff --git a/jenkins-docker/slave-chrome/Makefile b/jenkins-docker/agent-chrome/Makefile
similarity index 95%
rename from jenkins-docker/slave-chrome/Makefile
rename to jenkins-docker/agent-chrome/Makefile
index 3101bb7..c1493cd 100644
--- a/jenkins-docker/slave-chrome/Makefile
+++ b/jenkins-docker/agent-chrome/Makefile
@@ -1,7 +1,7 @@
 NO_CACHE ?= false
 DEBIAN_VER ?= buster
 PREFIX=gerritforge
-IMAGE=${PREFIX}/gerrit-ci-slave-chrome:$(DEBIAN_VER)
+IMAGE=${PREFIX}/gerrit-ci-agent-chrome:$(DEBIAN_VER)
 CHROME_VERS = latest 69.0.3497.92
 
 build: Makefile Dockerfile
diff --git a/jenkins-docker/slave-debian/Dockerfile b/jenkins-docker/agent-debian/Dockerfile
similarity index 100%
rename from jenkins-docker/slave-debian/Dockerfile
rename to jenkins-docker/agent-debian/Dockerfile
diff --git a/jenkins-docker/slave-debian/Makefile b/jenkins-docker/agent-debian/Makefile
similarity index 93%
rename from jenkins-docker/slave-debian/Makefile
rename to jenkins-docker/agent-debian/Makefile
index 3089f42..c795c63 100644
--- a/jenkins-docker/slave-debian/Makefile
+++ b/jenkins-docker/agent-debian/Makefile
@@ -1,6 +1,6 @@
 NO_CACHE ?= false
 PREFIX=gerritforge
-IMAGE=${PREFIX}/gerrit-ci-slave-debian
+IMAGE=${PREFIX}/gerrit-ci-agent-debian
 MAVEN_VER=3.6.3
 GIT_VER=2.26.2
 DEBIAN_VER=buster
diff --git a/jenkins-docker/slave-debian/gitconfig b/jenkins-docker/agent-debian/gitconfig
similarity index 100%
rename from jenkins-docker/slave-debian/gitconfig
rename to jenkins-docker/agent-debian/gitconfig
diff --git a/jenkins-docker/slave-debian/set-java.sh b/jenkins-docker/agent-debian/set-java.sh
similarity index 100%
rename from jenkins-docker/slave-debian/set-java.sh
rename to jenkins-docker/agent-debian/set-java.sh
diff --git a/jenkins-docker/slave-jekyll/Dockerfile b/jenkins-docker/agent-jekyll/Dockerfile
similarity index 90%
rename from jenkins-docker/slave-jekyll/Dockerfile
rename to jenkins-docker/agent-jekyll/Dockerfile
index 9430786..2ac7c9d 100644
--- a/jenkins-docker/slave-jekyll/Dockerfile
+++ b/jenkins-docker/agent-jekyll/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-python3:buster
+FROM gerritforge/gerrit-ci-agent-python3:buster
 
 RUN apt-get update --allow-releaseinfo-change && \
     apt-get install -y ruby-full && \
diff --git a/jenkins-docker/slave-jekyll/Makefile b/jenkins-docker/agent-jekyll/Makefile
similarity index 85%
rename from jenkins-docker/slave-jekyll/Makefile
rename to jenkins-docker/agent-jekyll/Makefile
index 7089017..feec586 100644
--- a/jenkins-docker/slave-jekyll/Makefile
+++ b/jenkins-docker/agent-jekyll/Makefile
@@ -1,6 +1,6 @@
 NO_CACHE ?= false
 PREFIX=gerritforge
-IMAGE=${PREFIX}/gerrit-ci-slave-jekyll
+IMAGE=${PREFIX}/gerrit-ci-agent-jekyll
 
 build:  Dockerfile Makefile
 	docker build --no-cache=$(NO_CACHE) -f Dockerfile -t $(IMAGE) .
diff --git a/jenkins-docker/slave-mvn/Dockerfile b/jenkins-docker/agent-mvn/Dockerfile
similarity index 88%
rename from jenkins-docker/slave-mvn/Dockerfile
rename to jenkins-docker/agent-mvn/Dockerfile
index e4145ff..5241e3d 100644
--- a/jenkins-docker/slave-mvn/Dockerfile
+++ b/jenkins-docker/agent-mvn/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-bazel:debian-buster-80.0.3987.149
+FROM gerritforge/gerrit-ci-agent-bazel:debian-buster-80.0.3987.149
 
 USER jenkins
 
diff --git a/jenkins-docker/slave-aws/Makefile b/jenkins-docker/agent-mvn/Makefile
similarity index 84%
copy from jenkins-docker/slave-aws/Makefile
copy to jenkins-docker/agent-mvn/Makefile
index 3f4a84c..76d618a 100644
--- a/jenkins-docker/slave-aws/Makefile
+++ b/jenkins-docker/agent-mvn/Makefile
@@ -1,6 +1,6 @@
 NO_CACHE=false
 PREFIX=gerritforge
-IMAGE=${PREFIX}/gerrit-ci-slave-aws
+IMAGE=${PREFIX}/gerrit-ci-agent-mvn
 
 # Targets
 
diff --git a/jenkins-docker/slave-mvn/wct.conf.json b/jenkins-docker/agent-mvn/wct.conf.json
similarity index 100%
rename from jenkins-docker/slave-mvn/wct.conf.json
rename to jenkins-docker/agent-mvn/wct.conf.json
diff --git a/jenkins-docker/slave-node-wct/Dockerfile b/jenkins-docker/agent-node-wct/Dockerfile
similarity index 93%
rename from jenkins-docker/slave-node-wct/Dockerfile
rename to jenkins-docker/agent-node-wct/Dockerfile
index b8a2629..c0dc506 100644
--- a/jenkins-docker/slave-node-wct/Dockerfile
+++ b/jenkins-docker/agent-node-wct/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-chrome:buster-$CHROME_VER
+FROM gerritforge/gerrit-ci-agent-chrome:buster-$CHROME_VER
 
 # Node JS for PolyGerrit build
 
diff --git a/jenkins-docker/slave-node-wct/Makefile b/jenkins-docker/agent-node-wct/Makefile
similarity index 91%
rename from jenkins-docker/slave-node-wct/Makefile
rename to jenkins-docker/agent-node-wct/Makefile
index 46d3e91..9ed9dca 100644
--- a/jenkins-docker/slave-node-wct/Makefile
+++ b/jenkins-docker/agent-node-wct/Makefile
@@ -4,7 +4,7 @@
 NODE_VER ?= 10
 WCT_VER ?= 6.8.0
 PREFIX=gerritforge
-IMAGE=${PREFIX}/gerrit-ci-slave-node-wct:$(NODE_VER)-$(WCT_VER)
+IMAGE=${PREFIX}/gerrit-ci-agent-node-wct:$(NODE_VER)-$(WCT_VER)
 
 build:  Dockerfile Makefile
 	@for chrome_ver in $(CHROME_VERS); \
diff --git a/jenkins-docker/slave-node-wct/wct.conf.json b/jenkins-docker/agent-node-wct/wct.conf.json
similarity index 100%
rename from jenkins-docker/slave-node-wct/wct.conf.json
rename to jenkins-docker/agent-node-wct/wct.conf.json
diff --git a/jenkins-docker/slave-python3/Dockerfile b/jenkins-docker/agent-python3/Dockerfile
similarity index 75%
rename from jenkins-docker/slave-python3/Dockerfile
rename to jenkins-docker/agent-python3/Dockerfile
index 16da929..20a2087 100644
--- a/jenkins-docker/slave-python3/Dockerfile
+++ b/jenkins-docker/agent-python3/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-debian:$DEBIAN_VER
+FROM gerritforge/gerrit-ci-agent-debian:$DEBIAN_VER
 
 RUN apt-get update --allow-releaseinfo-change && apt-get install -y \
     python3-pip && \
diff --git a/jenkins-docker/slave-python3/Makefile b/jenkins-docker/agent-python3/Makefile
similarity index 86%
rename from jenkins-docker/slave-python3/Makefile
rename to jenkins-docker/agent-python3/Makefile
index 0bceabc..b99c36e 100644
--- a/jenkins-docker/slave-python3/Makefile
+++ b/jenkins-docker/agent-python3/Makefile
@@ -1,7 +1,7 @@
 NO_CACHE ?= false
 DEBIAN_VER ?= buster
 PREFIX=gerritforge
-IMAGE=${PREFIX}/gerrit-ci-slave-python3:$(DEBIAN_VER)
+IMAGE=${PREFIX}/gerrit-ci-agent-python3:$(DEBIAN_VER)
 
 build:  Dockerfile Makefile
 	cat Dockerfile | DEBIAN_VER=$(DEBIAN_VER) envsubst > Dockerfile-$(DEBIAN_VER)
diff --git a/jenkins-docker/slave-release/Dockerfile b/jenkins-docker/agent-release/Dockerfile
similarity index 90%
rename from jenkins-docker/slave-release/Dockerfile
rename to jenkins-docker/agent-release/Dockerfile
index bc64ad1..ecad109 100644
--- a/jenkins-docker/slave-release/Dockerfile
+++ b/jenkins-docker/agent-release/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-bazel:debian-buster-nocache-latest
+FROM gerritforge/gerrit-ci-agent-bazel:debian-buster-nocache-latest
 
 RUN apt-get update --allow-releaseinfo-change && \
     apt-get install -y gnupg2 && \
diff --git a/jenkins-docker/slave-release/Makefile b/jenkins-docker/agent-release/Makefile
similarity index 95%
rename from jenkins-docker/slave-release/Makefile
rename to jenkins-docker/agent-release/Makefile
index 72e045b..586bece 100644
--- a/jenkins-docker/slave-release/Makefile
+++ b/jenkins-docker/agent-release/Makefile
@@ -39,7 +39,7 @@
 		-v ${GIT_COOKIES}:/home/jenkins/.gitcookies
 
 pull:
-	docker pull gerritforge/gerrit-ci-slave-bazel:debian-buster-nocache-latest
+	docker pull gerritforge/gerrit-ci-agent-bazel:debian-buster-nocache-latest
 
 build: pull
 	docker build --no-cache=$(NO_CACHE) -t ${IMAGE} .
diff --git a/jenkins-docker/slave-release/gerrit-release.sh b/jenkins-docker/agent-release/gerrit-release.sh
similarity index 100%
rename from jenkins-docker/slave-release/gerrit-release.sh
rename to jenkins-docker/agent-release/gerrit-release.sh
diff --git a/jenkins-docker/slave-sbt/Dockerfile b/jenkins-docker/agent-sbt/Dockerfile
similarity index 93%
rename from jenkins-docker/slave-sbt/Dockerfile
rename to jenkins-docker/agent-sbt/Dockerfile
index 15f1c25..75916f8 100644
--- a/jenkins-docker/slave-sbt/Dockerfile
+++ b/jenkins-docker/agent-sbt/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-bazel:debian-buster-latest
+FROM gerritforge/gerrit-ci-agent-bazel:debian-buster-latest
 
 # SBT Setup
 RUN apt-get update --allow-releaseinfo-change && \
diff --git a/jenkins-docker/slave-aws/Makefile b/jenkins-docker/agent-sbt/Makefile
similarity index 82%
copy from jenkins-docker/slave-aws/Makefile
copy to jenkins-docker/agent-sbt/Makefile
index 3f4a84c..c128868 100644
--- a/jenkins-docker/slave-aws/Makefile
+++ b/jenkins-docker/agent-sbt/Makefile
@@ -1,6 +1,6 @@
 NO_CACHE=false
 PREFIX=gerritforge
-IMAGE=${PREFIX}/gerrit-ci-slave-aws
+IMAGE=${PREFIX}/gerrit-ci-agent-bazel-sbt
 
 # Targets
 
diff --git a/jenkins-docker/master/config.xml b/jenkins-docker/master/config.xml
index 9c94de1..cd797e3 100644
--- a/jenkins-docker/master/config.xml
+++ b/jenkins-docker/master/config.xml
@@ -52,7 +52,7 @@
           </retentionStrategy>
           <numExecutors>1</numExecutors>
           <dockerTemplateBase>
-            <image>gerritforge/gerrit-ci-slave-bazel-docker:debian-buster-latest</image>
+            <image>gerritforge/gerrit-ci-agent-bazel-docker:debian-buster-latest</image>
             <dockerCommand></dockerCommand>
             <lxcConfString></lxcConfString>
             <hostname></hostname>
@@ -89,7 +89,7 @@
           </retentionStrategy>
           <numExecutors>1</numExecutors>
           <dockerTemplateBase>
-            <image>gerritforge/gerrit-ci-slave-bazel-docker:debian-buster-69.0.3497.92</image>
+            <image>gerritforge/gerrit-ci-agent-bazel-docker:debian-buster-69.0.3497.92</image>
             <dockerCommand></dockerCommand>
             <lxcConfString></lxcConfString>
             <hostname></hostname>
@@ -126,7 +126,7 @@
           </retentionStrategy>
           <numExecutors>1</numExecutors>
           <dockerTemplateBase>
-            <image>gerritforge/gerrit-ci-slave-mvn</image>
+            <image>gerritforge/gerrit-ci-agent-mvn</image>
             <dockerCommand></dockerCommand>
             <lxcConfString>mvn</lxcConfString>
             <hostname></hostname>
@@ -164,7 +164,7 @@
           </retentionStrategy>
           <numExecutors>1</numExecutors>
           <dockerTemplateBase>
-            <image>gerritforge/gerrit-ci-slave-bazel-sbt</image>
+            <image>gerritforge/gerrit-ci-agent-bazel-sbt</image>
             <dockerCommand></dockerCommand>
             <lxcConfString>sbt</lxcConfString>
             <hostname></hostname>
@@ -202,7 +202,7 @@
           </retentionStrategy>
           <numExecutors>1</numExecutors>
           <dockerTemplateBase>
-            <image>gerritforge/gerrit-ci-slave-python3:buster</image>
+            <image>gerritforge/gerrit-ci-agent-python3:buster</image>
             <dockerCommand></dockerCommand>
             <lxcConfString></lxcConfString>
             <hostname></hostname>
@@ -239,7 +239,7 @@
           </retentionStrategy>
           <numExecutors>1</numExecutors>
           <dockerTemplateBase>
-            <image>gerritforge/gerrit-ci-slave-jekyll</image>
+            <image>gerritforge/gerrit-ci-agent-jekyll</image>
             <dockerCommand></dockerCommand>
             <lxcConfString></lxcConfString>
             <hostname></hostname>
@@ -276,7 +276,7 @@
           </retentionStrategy>
           <numExecutors>1</numExecutors>
           <dockerTemplateBase>
-            <image>gerritforge/gerrit-ci-slave-aws</image>
+            <image>gerritforge/gerrit-ci-agent-aws</image>
             <dockerCommand></dockerCommand>
             <lxcConfString>aws</lxcConfString>
             <hostname></hostname>
diff --git a/jenkins-docker/slave-mvn/Makefile b/jenkins-docker/slave-mvn/Makefile
deleted file mode 100644
index 217c2c3..0000000
--- a/jenkins-docker/slave-mvn/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-NO_CACHE=false
-PREFIX=gerritforge
-IMAGE=${PREFIX}/gerrit-ci-slave-mvn
-
-# Targets
-
-build:
-	docker build --no-cache=$(NO_CACHE) -t ${IMAGE} .
-
-publish:
-	docker push ${IMAGE}
-
-clean:
-	docker rmi -f ${IMAGE}
-
-.PHONY: clean image publish
-
diff --git a/jenkins-docker/slave-sbt/Makefile b/jenkins-docker/slave-sbt/Makefile
deleted file mode 100644
index d2a811e..0000000
--- a/jenkins-docker/slave-sbt/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-NO_CACHE=false
-PREFIX=gerritforge
-IMAGE=${PREFIX}/gerrit-ci-slave-bazel-sbt
-
-# Targets
-
-build:
-	docker build --no-cache=$(NO_CACHE) -t ${IMAGE} .
-
-publish:
-	docker push ${IMAGE}
-
-clean:
-	docker rmi -f ${IMAGE}
-
-.PHONY: clean image publish
-
diff --git a/vars/gerritPipeline.groovy b/vars/gerritPipeline.groovy
index 14f1d71..c062c33 100644
--- a/vars/gerritPipeline.groovy
+++ b/vars/gerritPipeline.groovy
@@ -172,13 +172,13 @@
 def prepareBuildsForMode(buildName, mode="reviewdb", retryTimes = 1) {
     return {
         stage("${buildName}/${mode}") {
-            def slaveBuild = null
+            def agentBuild = null
             for (int i = 1; i <= retryTimes; i++) {
                 postCheck(new GerritCheck(
                     (buildName == "Gerrit-codestyle") ? "codestyle" : mode,
                     new Build(currentBuild.getAbsoluteUrl(), null)))
                 try {
-                    slaveBuild = build job: "${buildName}", parameters: [
+                    agentBuild = build job: "${buildName}", parameters: [
                         string(name: 'REFSPEC', value: "refs/changes/${env.BRANCH_NAME}"),
                         string(name: 'BRANCH', value: env.GERRIT_PATCHSET_REVISION),
                         string(name: 'CHANGE_URL', value: "${Globals.gerritUrl}c/${env.GERRIT_PROJECT}/+/${env.GERRIT_CHANGE_NUMBER}"),
@@ -188,14 +188,14 @@
                 } finally {
                     if (buildName == "Gerrit-codestyle"){
                         Builds.codeStyle = new Build(
-                            slaveBuild.getAbsoluteUrl(), slaveBuild.getResult())
+                            agentBuild.getAbsoluteUrl(), agentBuild.getResult())
                         postCheck(new GerritCheck("codestyle", Builds.codeStyle))
                     } else {
                         Builds.verification[mode] = new Build(
-                            slaveBuild.getAbsoluteUrl(), slaveBuild.getResult())
+                            agentBuild.getAbsoluteUrl(), agentBuild.getResult())
                         postCheck(new GerritCheck(mode, Builds.verification[mode]))
                     }
-                    if (slaveBuild.getResult() == "SUCCESS") {
+                    if (agentBuild.getResult() == "SUCCESS") {
                         break
                     }
                 }