osmith submitted this change.
jobs/update-osmo-…: only trigger container rebuild
Installing osmo-python-tests to the jenkins nodes should not be needed
anymore, as builds of almost all jenkins jobs are done in docker where
we install osmo-python-tests inside the containers where it is needed.
We already removed the initial deployment to jenkins nodes via ansible
in I7c87bd516d1bcdbcc21f65909dabbd3ccc38eede ("ansible:
osmocom_build_deps: remove"), let's adjust the job that updates
osmo-python-tests too. Instead of deploying it directly, only trigger
a rebuild of containers.
I'm doing this now because the jenkins job started failing after
I42ba71e2fd0ceb8466758ea46e9ae33e3d4fcb91 ("contrib/jenkins.sh: use
virtualenv and pip") on some nodes where virtualenv is not available.
The contrib/jenkins.sh script was used for both CI verification and to
actually deploy this python package to the jenkins nodes, which was
not really obvious and also as noted above isn't needed anymore.
Change-Id: I3b06a2fc2c7182d0b0a4d13b82f67a9db1be2fd0
---
A jobs/update-containers-osmo-python-tests.yml
D jobs/update-osmo-python-on-slaves.yml
2 files changed, 50 insertions(+), 47 deletions(-)
diff --git a/jobs/update-containers-osmo-python-tests.yml b/jobs/update-containers-osmo-python-tests.yml
new file mode 100644
index 0000000..63b2929
--- /dev/null
+++ b/jobs/update-containers-osmo-python-tests.yml
@@ -0,0 +1,25 @@
+- job:
+ name: update-containers-osmo-python-tests
+ description: |
+ Trigger rebuild of containers after osmo-python-tests.git has changed.
+ properties:
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 120
+ scm:
+ - git:
+ url: https://gerrit.osmocom.org/python/osmo-python-tests
+ branches:
+ - 'origin/master'
+ skip-tag: true
+ wipe-workspace: true
+ triggers:
+ - pollscm:
+ cron: "H/5 * * * *"
+ ignore-post-commit-hooks: false
+ publishers:
+ - trigger:
+ project: update-osmo-ci-on-slaves
+ threshold: FAILURE
+ - email:
+ recipients: jenkins-notifications@lists.osmocom.org
diff --git a/jobs/update-osmo-python-on-slaves.yml b/jobs/update-osmo-python-on-slaves.yml
deleted file mode 100644
index df01409..0000000
--- a/jobs/update-osmo-python-on-slaves.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-- job:
- name: update-osmo-python-on-slaves
- project-type: matrix
- axes:
- - axis:
- type: slave
- name: label
- values:
- - build2-deb10build-ansible
- - build2-deb11build-ansible
- - build4-deb12build-ansible
- - host2-deb11build-ansible
- - lx2-raspbian11build-ansible
- - rpi4-raspbian11build-ansible-1
- - rpi4-raspbian11build-ansible-2
- - rpi4-raspbian11build-ansible-3
- properties:
- - build-discarder:
- days-to-keep: 30
- num-to-keep: 120
- scm:
- - git:
- url: https://gerrit.osmocom.org/python/osmo-python-tests
- branches:
- - 'origin/master'
- skip-tag: true
- wipe-workspace: true
-
- triggers:
- - pollscm:
- cron: "H/5 * * * *"
- ignore-post-commit-hooks: false
-
- builders:
- - shell: './contrib/jenkins.sh'
- description: |
- <b>Auto-generated using Jenkins Job Builder. DO NOT EDIT MANUALLY!</b>
-
- # make sure to update the osmo-python in docker images, rebuilt from osmo-ci/contrib/jenkins.sh
- publishers:
- - trigger:
- project: update-osmo-ci-on-slaves
- threshold: FAILURE
- - email:
- recipients: jenkins-notifications@lists.osmocom.org
-
-# vim: expandtab tabstop=2 shiftwidth=2
To view, visit change 37549. To unsubscribe, or for help writing mail filters, visit settings.