osmith submitted this change.

View Change

Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved
jobs/update-osmo-ci: don't rebuild docker images

Instead of rebuilding docker images on each builder daily and whenever
there is a change in either osmo-ci or docker-playground, we now only
rebuild and upload them on demand with the registry-rebuild-upload jobs,
see previous commits.

Related: OS#7117
Change-Id: I942e8dbffe5678b8bba74c2e7c36a94e62e6b8ea
---
M ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml
M jobs/update-osmo-ci-on-slaves.yml
D scripts/osmo-ci-docker-rebuild.sh
M scripts/update-osmo-ci/update-osmo-ci.sh
4 files changed, 1 insertion(+), 65 deletions(-)

diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml
index a2f2797..26f0236 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmo-ci.yml
@@ -1,8 +1,6 @@
---

-# this is from the "update-osmo-ci-on-slaves" jenkins job. However,
-# we need to initially install osmo-ci and the docker images *before*
-# that jenkins job can execute subsequent updates
+# This is from the "update-osmo-ci-on-slaves" jenkins job.

- name: install osmo-ci build dependencies
apt:
@@ -25,10 +23,3 @@
git:
repo: "https://gerrit.osmocom.org/osmo-gsm-manuals"
dest: "/home/{{ jenkins_user }}/osmo-gsm-manuals"
-
-- name: rebuild osmocom docker images for jenkins build tests
- become: yes
- become_user: "{{ jenkins_user }}"
- shell: ./scripts/osmo-ci-docker-rebuild.sh
- args:
- chdir: "/home/{{ jenkins_user }}/osmo-ci"
diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml
index f05c21c..2b43873 100644
--- a/jobs/update-osmo-ci-on-slaves.yml
+++ b/jobs/update-osmo-ci-on-slaves.yml
@@ -24,12 +24,6 @@
description: |
osmo-ci.git branch
default: 'master'
- - string:
- # Used in scripts/common.sh:docker_images_require()
- name: OSMO_BRANCH_DOCKER_PLAYGROUND
- description: |
- docker-playground.git branch
- default: 'master'
scm:
- git:
url: https://gerrit.osmocom.org/osmo-ci
@@ -60,27 +54,5 @@
- email:
recipients: jenkins-notifications@lists.osmocom.org

-# Trigger from docker-playground.git too
-- job:
- name: update-osmo-ci-on-slaves-dp
- description: |
- Trigger <a href="https://jenkins.osmocom.org/jenkins/job/update-osmo-ci-on-slaves/">update-osmo-ci-on-slaves</a>
- on changes in docker-playground.git, so it can rebuild docker containers relevant for the jenkins slaves.
- scm:
- - git:
- url: https://gerrit.osmocom.org/docker-playground
- git-config-name: 'Jenkins Builder'
- git-config-email: 'jenkins@osmocom.org'
- skip-tag: true
- branches:
- - 'master'
- triggers:
- - pollscm:
- cron: "H/5 * * * *"
- ignore-post-commit-hooks: false
- publishers:
- - trigger:
- project: "update-osmo-ci-on-slaves"
-

# vim: expandtab tabstop=2 shiftwidth=2
diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh
deleted file mode 100755
index 4461e66..0000000
--- a/scripts/osmo-ci-docker-rebuild.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-set -e -x
-cd "$(dirname "$0")/.."
-. scripts/common.sh
-
-case "$(arch)" in
-x86_64)
- # OS#6859: still need bookworm for osmo-opencm3-projects
- docker_images_require \
- "debian-bookworm-build" \
- "debian-bookworm-erlang" \
- "debian-trixie-build"
- ;;
-arm*|aarch64)
- # OS#6627: need to run a separate "docker pull" command with platform
- docker pull docker.io/arm32v7/debian:trixie --platform="linux/arm/v7"
-
- export NO_DOCKER_IMAGE_PULL=1
- docker_images_require \
- "debian-bookworm-build-arm" \
- "debian-trixie-build-arm"
- ;;
-esac
diff --git a/scripts/update-osmo-ci/update-osmo-ci.sh b/scripts/update-osmo-ci/update-osmo-ci.sh
index 717cd63..e562bc6 100755
--- a/scripts/update-osmo-ci/update-osmo-ci.sh
+++ b/scripts/update-osmo-ci/update-osmo-ci.sh
@@ -30,7 +30,3 @@

clone_repo osmo-ci
clone_repo osmo-gsm-manuals
-
-if [ `uname` = "Linux" ] && [ "x${OSMO_CI_NO_DOCKER}" != "x1" ]; then
- scripts/osmo-ci-docker-rebuild.sh
-fi

To view, visit change 44057. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I942e8dbffe5678b8bba74c2e7c36a94e62e6b8ea
Gerrit-Change-Number: 44057
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>