From fff3204ae2008e9d28362a11a2f20c5f9de68ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sun, 19 Jul 2026 21:04:48 +0200 Subject: [PATCH] ci: docker: drop the in-tree testbed container MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The testbed container now has its own prpl Foundation project, release pipeline, and versioned registry image. Keeping the old Debian Buster image in prplos leaves two sources for the same CI runtime and continues to expose obsolete build, test, and deploy jobs. Remove the in-tree Dockerfile and its CI job definitions. Drop the root include because the testbed and CDRouter templates now consume the external containers/testbed release directly. Assisted-by: codex:gpt-5 Signed-off-by: Petr Štetiar References: PPW-1258 --- .gitlab-ci.yml | 1 - .gitlab/docker/testbed/Dockerfile | 73 ------------------------------- .gitlab/docker/testbed/gitlab.yml | 22 ---------- 3 files changed, 96 deletions(-) delete mode 100644 .gitlab/docker/testbed/Dockerfile delete mode 100644 .gitlab/docker/testbed/gitlab.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b799eeb65..5e808a4d93 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,6 @@ include: - local: .gitlab/coverity.yml - local: .gitlab/docker.yml - local: .gitlab/docker/builder/gitlab.yml - - local: .gitlab/docker/testbed/gitlab.yml - local: .gitlab/docker/sdk/gitlab.yml - local: .gitlab/docker/ib/gitlab.yml - local: .gitlab/docker/ib/lcm/gitlab.yml diff --git a/.gitlab/docker/testbed/Dockerfile b/.gitlab/docker/testbed/Dockerfile deleted file mode 100644 index f336cda2cc..0000000000 --- a/.gitlab/docker/testbed/Dockerfile +++ /dev/null @@ -1,73 +0,0 @@ -FROM debian:buster-slim - -ENV DEBIAN_FRONTEND=noninteractive - -RUN \ - apt-get update && \ - apt-get install --yes --no-install-recommends \ - curl \ - etherwake \ - git-core \ - iproute2 \ - iputils-ping \ - jq \ - locales \ - netcat-openbsd \ - nmap \ - ntpdate \ - openssh-client \ - python3 \ - python3-pip \ - sshpass \ - sudo \ - tcpdump \ - xz-utils && \ - apt-get -y autoremove && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 -ENV LANG=en_US.utf8 - -ENV LABGRID_COMMIT=1ca30de33a1f57eb -RUN git clone --branch wip/testbed-next https://gitlab.com/prpl-foundation/prplOS/labgrid -WORKDIR labgrid -RUN git reset --hard $LABGRID_COMMIT - -RUN \ - python3 -m pip install -U pip==23.2.1 setuptools==47.3.2 setuptools-scm==7.1.0 && \ - python3 -m pip install -r requirements.txt && \ - python3 -m pip install -r modbus-requirements.txt && \ - python3 setup.py install && \ - rm -fr /labgrid - -RUN pip3 install \ - cdrouter \ - cram \ - humanize \ - jira \ - 'marshmallow<3.0.0' \ - pyjwt \ - async-upnp-client \ - servefile - -ENV TMATE_VERSION=2.4.0 -ENV TMATE_SHA256SUM=6e503a1a3b0f9117bce6ff7cc30cf61bdc79e9b32d074cf96deb0264e067a60d -ENV TMATE_DL_URL=https://github.com/tmate-io/tmate/releases/download - -RUN \ - curl --location --silent \ - "$TMATE_DL_URL/$TMATE_VERSION/tmate-${TMATE_VERSION}-static-linux-amd64.tar.xz" > tmate.tar.xz && \ - sha256sum tmate.tar.xz | grep -q "$TMATE_SHA256SUM" && \ - tar xf tmate.tar.xz --strip-components=1 -C /usr/local/bin && \ - rm tmate.tar.xz - -RUN \ - echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers && \ - useradd -c "OpenWrt Testbed" -m -d /home/testbed -G sudo -s /bin/bash testbed - -USER testbed -ENV HOME /home/testbed -WORKDIR /home/testbed/ - -VOLUME [ "/home/testbed" ] diff --git a/.gitlab/docker/testbed/gitlab.yml b/.gitlab/docker/testbed/gitlab.yml deleted file mode 100644 index 5aadcffd03..0000000000 --- a/.gitlab/docker/testbed/gitlab.yml +++ /dev/null @@ -1,22 +0,0 @@ -build Docker image testbed: - extends: .build Docker image - variables: - DOCKER_DOCKERFILE_PATH: .gitlab/docker/testbed - -test Docker image testbed: - stage: docker test - extends: .docker in docker - needs: ["build Docker image testbed"] - 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/$CI_DESIGNATED_BRANCH_SLUG/$IMAGE_NAME:$CI_COMMIT_REF_SLUG" - - > - docker run --rm "$CI_REGISTRY_IMAGE/$CI_DESIGNATED_BRANCH_SLUG/$IMAGE_NAME:$CI_COMMIT_REF_SLUG" sh -c " - python3 -c 'import labgrid; import yaml; import jira; import jwt; import cdrouter' && tmate -V - " - -deploy Docker image testbed: - stage: docker deploy - extends: .deploy Docker image - needs: ["test Docker image testbed"]