Stop using WCT variable in docker images
Also rename agent-node-wct to agent-node.
Change-Id: Idfcad0fd59134a314e5711a6932957b874d7c3f5
diff --git a/jenkins-docker/Makefile b/jenkins-docker/Makefile
index f8539ef..ec02283 100644
--- a/jenkins-docker/Makefile
+++ b/jenkins-docker/Makefile
@@ -1,4 +1,4 @@
-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
+AGENT_DIRS ?= agent-debian agent-chrome agent-node agent-bazel-nocache agent-bazel agent-bazel-docker agent-sbt agent-mvn agent-release agent-python3 agent-jekyll agent-aws
ALL_DIRS ?= server bazel-cache $(AGENT_DIRS)
NO_CACHE ?= true
diff --git a/jenkins-docker/agent-bazel-nocache/Dockerfile b/jenkins-docker/agent-bazel-nocache/Dockerfile
index 02c8885..0c4f11a 100644
--- a/jenkins-docker/agent-bazel-nocache/Dockerfile
+++ b/jenkins-docker/agent-bazel-nocache/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-agent-node-wct:$NODE_VER-$WCT_VER-$CHROME_VER
+FROM gerritforge/gerrit-ci-agent-node:$NODE_VER-$CHROME_VER
ARG BAZEL_VER
ARG BUILDIFIER_VER
diff --git a/jenkins-docker/agent-bazel-nocache/Makefile b/jenkins-docker/agent-bazel-nocache/Makefile
index d085667..e875f70 100644
--- a/jenkins-docker/agent-bazel-nocache/Makefile
+++ b/jenkins-docker/agent-bazel-nocache/Makefile
@@ -7,7 +7,6 @@
BUILDIFIER_VER=4.0.0
BAZELISK_VER=1.12.0
NODE_VER=10
-WCT_VER=6.8.0
# Targets
@@ -19,7 +18,6 @@
BUILDIFIER_VER=${BUILDIFIER_VER} \
BAZELISK_VER=${BAZELISK_VER} \
NODE_VER=${NODE_VER} \
- WCT_VER=${WCT_VER} \
CHROME_VER=$$chrome_ver envsubst > Dockerfile-subst; \
docker build --no-cache=$(NO_CACHE) \
-f Dockerfile-subst \
diff --git a/jenkins-docker/agent-node-wct/Dockerfile b/jenkins-docker/agent-node/Dockerfile
similarity index 100%
rename from jenkins-docker/agent-node-wct/Dockerfile
rename to jenkins-docker/agent-node/Dockerfile
diff --git a/jenkins-docker/agent-node-wct/Makefile b/jenkins-docker/agent-node/Makefile
similarity index 61%
rename from jenkins-docker/agent-node-wct/Makefile
rename to jenkins-docker/agent-node/Makefile
index 9ed9dca..6111355 100644
--- a/jenkins-docker/agent-node-wct/Makefile
+++ b/jenkins-docker/agent-node/Makefile
@@ -2,15 +2,14 @@
NO_CACHE ?= false
NODE_VER ?= 10
-WCT_VER ?= 6.8.0
PREFIX=gerritforge
-IMAGE=${PREFIX}/gerrit-ci-agent-node-wct:$(NODE_VER)-$(WCT_VER)
+IMAGE=${PREFIX}/gerrit-ci-agent-node:$(NODE_VER)
build: Dockerfile Makefile
@for chrome_ver in $(CHROME_VERS); \
do \
- cat Dockerfile | NODE_VER=$(NODE_VER) WCT_VER=$(WCT_VER) CHROME_VER=$$chrome_ver envsubst > Dockerfile-$(NODE_VER)-$(WCT_VER)-$$chrome_ver ; \
- docker build --no-cache=$(NO_CACHE) -f Dockerfile-$(NODE_VER)-$(WCT_VER)-$$chrome_ver -t $(IMAGE)-$$chrome_ver . ; \
+ cat Dockerfile | NODE_VER=$(NODE_VER) CHROME_VER=$$chrome_ver envsubst > Dockerfile-$(NODE_VER)-$$chrome_ver ; \
+ docker build --no-cache=$(NO_CACHE) -f Dockerfile-$(NODE_VER)-$$chrome_ver -t $(IMAGE)-$$chrome_ver . ; \
done
publish: build
