[buildbot] ci: remove very old GitLab bits
LEDE Commits
lede-commits at lists.infradead.org
Sun Jan 11 09:07:26 PST 2026
ynezz pushed a commit to buildbot.git, branch main:
https://git.openwrt.org/1bf56cae86e57c82c62932f1f6dcd1cedf13f092
commit 1bf56cae86e57c82c62932f1f6dcd1cedf13f092
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Sun Jan 11 13:53:54 2026 +0000
ci: remove very old GitLab bits
To make the tree clean and tidy.
Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
.gitlab-ci.yml | 13 ------------
.gitlab/docker.yml | 40 -----------------------------------
.gitlab/docker/README.md | 6 ------
.gitlab/docker/buildmaster/gitlab.yml | 20 ------------------
.gitlab/docker/buildworker/gitlab.yml | 21 ------------------
5 files changed, 100 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 2ad470e..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-variables:
- BUILDBOT_VERSION: 3.5.0
- OPENWRT_VERSION: $CI_COMMIT_SHORT_SHA
-
-include:
- - local: .gitlab/docker.yml
- - local: .gitlab/docker/buildmaster/gitlab.yml
- - local: .gitlab/docker/buildworker/gitlab.yml
-
-stages:
- - docker
- - docker test
- - docker deploy
diff --git a/.gitlab/docker.yml b/.gitlab/docker.yml
deleted file mode 100644
index 5cc4951..0000000
--- a/.gitlab/docker.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-.docker in docker:
- tags:
- - linux
- - openwrt
- - light-jobs
- - docker-privileged
- image: docker:19.03.7
- services:
- - docker:19.03.7-dind
- variables:
- DOCKER_DRIVER: overlay2
- DOCKER_TLS_CERTDIR: "/certs"
-
-.build Docker image:
- stage: docker
- extends: .docker in docker
- script:
- - export IMAGE_NAME="$(echo $CI_JOB_NAME | sed 's/build Docker image \(.*\)/\1/')"
- - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- - docker build --build-arg BUILDBOT_VERSION=$BUILDBOT_VERSION --build-arg OPENWRT_VERSION=$OPENWRT_VERSION -t "$IMAGE_NAME" -f "docker/$IMAGE_NAME/Dockerfile" .
- - docker tag "$IMAGE_NAME" "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:$CI_COMMIT_REF_SLUG"
- - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:$CI_COMMIT_REF_SLUG"
-
-.deploy Docker image:
- extends: .docker in docker
- rules:
- - if: $CI_COMMIT_TAG
- - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- script:
- - export IMAGE_NAME="$(echo $CI_JOB_NAME | sed 's/deploy Docker image \(.*\)/\1/')"
- - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- - docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:$CI_COMMIT_REF_SLUG"
-
- - docker tag "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:$CI_COMMIT_REF_SLUG" "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:latest"
- - docker tag "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:latest" "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:$CI_COMMIT_SHORT_SHA"
- - docker tag "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:latest" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:latest"
-
- - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:latest"
- - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:$CI_COMMIT_SHORT_SHA"
- - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:latest"
diff --git a/.gitlab/docker/README.md b/.gitlab/docker/README.md
deleted file mode 100644
index 36bebea..0000000
--- a/.gitlab/docker/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Content
-
-This directory contains bits for Docker images used on the GitLab CI.
-
-## buildmaster
-## buildworker
diff --git a/.gitlab/docker/buildmaster/gitlab.yml b/.gitlab/docker/buildmaster/gitlab.yml
deleted file mode 100644
index 10460c6..0000000
--- a/.gitlab/docker/buildmaster/gitlab.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-build Docker image buildmaster:
- stage: docker
- extends: .build Docker image
-
-test Docker image buildmaster:
- stage: docker test
- extends: .docker in docker
- needs: ["build Docker image buildmaster"]
- script:
- - export IMAGE_NAME="$(echo $CI_JOB_NAME | sed 's/test Docker image \(.*\)/\1/')"
- - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- - docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:$CI_COMMIT_REF_SLUG"
- - >
- docker run --rm "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:$CI_COMMIT_REF_SLUG" |
- grep "buildmaster configured in /master"
-
-deploy Docker image buildmaster:
- stage: docker deploy
- extends: .deploy Docker image
- needs: ["test Docker image buildmaster"]
diff --git a/.gitlab/docker/buildworker/gitlab.yml b/.gitlab/docker/buildworker/gitlab.yml
deleted file mode 100644
index 64fc5d8..0000000
--- a/.gitlab/docker/buildworker/gitlab.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-build Docker image buildworker:
- stage: docker
- extends: .build Docker image
-
-.test Docker image buildworker:
- stage: docker test
- extends: .docker in docker
- needs: ["build Docker image buildworker"]
- script:
- - export IMAGE_NAME="$(echo $CI_JOB_NAME | sed 's/test Docker image \(.*\)/\1/')"
- - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- - docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:$CI_COMMIT_REF_SLUG"
- - >
- docker run --rm --env BUILDWORKER_NAME=foo --env BUILDWORKER_PASSWORD=XXX
- "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:$CI_COMMIT_REF_SLUG" |
- grep "worker configured in /builder"
-
-deploy Docker image buildworker:
- stage: docker deploy
- extends: .deploy Docker image
- #needs: ["test Docker image buildworker"]
More information about the lede-commits
mailing list