[buildbot] ci: rename OPENWRT_VERSION to BUILDBOT_CONFIG_SHA
LEDE Commits
lede-commits at lists.infradead.org
Mon Jan 12 11:23:48 PST 2026
ynezz pushed a commit to buildbot.git, branch main:
https://git.openwrt.org/61c35ecb418124b342da8db31b8d95e69bb30613
commit 61c35ecb418124b342da8db31b8d95e69bb30613
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Sun Jan 11 15:13:12 2026 +0100
ci: rename OPENWRT_VERSION to BUILDBOT_CONFIG_SHA
The old name was misleading as it suggested an OpenWrt release version.
The variable holds the git SHA of this buildbot config repository, used
for quick URL links to the configuration commit.
Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
.github/workflows/build-push.yml | 4 ++--
docker/buildmaster/Dockerfile | 4 ++--
docker/buildworker/Dockerfile | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index 2c5a717..ee9ec49 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -94,7 +94,7 @@ jobs:
file: docker/build${{ matrix.container_flavor }}/Dockerfile
build-args: |
BUILDBOT_VERSION=${{ env.BUILDBOT_VERSION }}
- OPENWRT_VERSION=${{ env.GIT_SHA_SHORT }}
+ BUILDBOT_CONFIG_SHA=${{ env.GIT_SHA_SHORT }}
CONTAINER_TAG=${{ env.CONTAINER_TAG }}
- name: Test ${{ matrix.container_flavor }} Docker container
@@ -166,5 +166,5 @@ jobs:
file: docker/build${{ matrix.container_flavor }}/Dockerfile
build-args: |
BUILDBOT_VERSION=${{ env.BUILDBOT_VERSION }}
- OPENWRT_VERSION=${{ env.GIT_SHA_SHORT }}
+ BUILDBOT_CONFIG_SHA=${{ env.GIT_SHA_SHORT }}
CONTAINER_TAG=${{ env.CONTAINER_TAG }}
diff --git a/docker/buildmaster/Dockerfile b/docker/buildmaster/Dockerfile
index 15899fd..9250e45 100644
--- a/docker/buildmaster/Dockerfile
+++ b/docker/buildmaster/Dockerfile
@@ -28,7 +28,7 @@ LABEL maintainer="OpenWrt Maintainers"
ARG DEBIAN_FRONTEND=noninteractive
ARG BUILDBOT_VERSION=2.10.1
-ARG OPENWRT_VERSION=unknown
+ARG BUILDBOT_CONFIG_SHA=unknown
ENV BUILDMASTER_CONFIG=config.ini
ENV BUILDMASTER_PHASE=1
@@ -74,7 +74,7 @@ RUN \
RUN \
sed -i \
- "s;\"col-sm-12\"><ul><li ng-repeat;\"col-sm-12\"><ul><li>OpenWrt version: <a href=\"https://git.openwrt.org/$OPENWRT_VERSION\">$OPENWRT_VERSION</a></li><li ng-repeat;" \
+ "s;\"col-sm-12\"><ul><li ng-repeat;\"col-sm-12\"><ul><li>OpenWrt buildbot config: <a href=\"https://git.openwrt.org/$BUILDBOT_CONFIG_SHA\">$BUILDBOT_CONFIG_SHA</a></li><li ng-repeat;" \
/opt/venv/lib/python*/site-packages/buildbot_www/static/scripts.js
ENV LANG=en_US.utf8
diff --git a/docker/buildworker/Dockerfile b/docker/buildworker/Dockerfile
index 3929170..9263127 100644
--- a/docker/buildworker/Dockerfile
+++ b/docker/buildworker/Dockerfile
@@ -3,12 +3,12 @@ LABEL maintainer="OpenWrt Maintainers"
ARG DEBIAN_FRONTEND=noninteractive
ARG BUILDBOT_VERSION=2.10.1
-ARG OPENWRT_VERSION=unknown
+ARG BUILDBOT_CONFIG_SHA=unknown
ARG CONTAINER_TAG=unknown
ENV BUILDWORKER_MASTER=builds.openwrt.org:9990
ENV BUILDWORKER_ADMIN=contact at openwrt.org
-ENV BUILDWORKER_DESCRIPTION="Container ($CONTAINER_TAG) https://git.openwrt.org/$OPENWRT_VERSION"
+ENV BUILDWORKER_DESCRIPTION="Container ($CONTAINER_TAG) https://git.openwrt.org/$BUILDBOT_CONFIG_SHA"
USER root
More information about the lede-commits
mailing list