summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ansible/README.md4
-rw-r--r--ansible/hosts3
-rw-r--r--ansible/roles/docker/tasks/main.yml9
-rw-r--r--ansible/roles/gsm-tester/tasks/main.yml1
-rw-r--r--ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml12
-rw-r--r--ansible/roles/podman/tasks/debian.yml33
-rw-r--r--ansible/roles/podman/tasks/main.yml7
-rw-r--r--jobs/gerrit-verifications.yml2
-rw-r--r--jobs/master-builds.yml6
-rw-r--r--jobs/osmocom-obs.yml2
-rw-r--r--jobs/registry-update-base-images.yml37
-rw-r--r--jobs/ttcn3-testsuites.yml11
-rw-r--r--jobs/update-osmo-ci-on-slaves.yml3
-rw-r--r--jobs/update-osmo-python-on-slaves.yml3
14 files changed, 114 insertions, 19 deletions
diff --git a/ansible/README.md b/ansible/README.md
index f3185ec..e5d146c 100644
--- a/ansible/README.md
+++ b/ansible/README.md
@@ -30,3 +30,7 @@ Host 2a01:4f8:13b:828::1:*
ProxyJump proxyuser@myhostproxy.com:22
User root
```
+
+# how to make slaves log-in to registry.osmocom.org:
+
+`ansible jenkins-slaves -u root -a "su - osmocom-build -c 'docker login -u jenkins-slave -p PASSWD https://registry.osmocom.org/'"`
diff --git a/ansible/hosts b/ansible/hosts
index 33b6b41..b417bab 100644
--- a/ansible/hosts
+++ b/ansible/hosts
@@ -8,12 +8,9 @@ build2-deb9build-ansible ansible_host=2a01:4f8:10b:2ad9::1:6
host2-deb9build-ansible ansible_host=2a01:4f8:120:8470::1:3
[jenkins-slaves]
-admin2-deb8build ansible_host=2a01:4f8:13b:828::1:400
admin2-deb9build ansible_host=2a01:4f8:13b:828::1:300 osmocom_jenkins_slave_fstrim=True
-build2-deb8build-ansible ansible_host=2a01:4f8:10b:2ad9::1:7
build2-deb9build-ansible ansible_host=2a01:4f8:10b:2ad9::1:6 osmocom_jenkins_slave_fstrim=True
build2-deb10build-ansible ansible_host=2a01:4f8:10b:2ad9::1:10 osmocom_jenkins_slave_fstrim=True
-host2-deb8build-ansible ansible_host=2a01:4f8:120:8470::1:2
host2-deb9build-ansible ansible_host=2a01:4f8:120:8470::1:3 osmocom_jenkins_slave_fstrim=True
rpi4-deb9build-ansible ansible_host=10.9.25.51
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
index 6ffe1af..c38d38b 100644
--- a/ansible/roles/docker/tasks/main.yml
+++ b/ansible/roles/docker/tasks/main.yml
@@ -9,6 +9,7 @@
- apt-transport-https
- gnupg
- cron
+ - ca-certificates
- name: add docker gpg key to apt keyring
apt_key:
@@ -21,9 +22,15 @@
update_cache: yes
when: ansible_distribution == "Debian"
-- name: install docker
+- name: install docker.io from Debian
+ apt:
+ name: docker.io
+ when: ansible_architecture != 'x86_64'
+
+- name: install docker-ce
apt:
name: docker-ce
+ when: ansible_architecture == 'x86_64'
- name: add jenkins to the docker group
user:
diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml
index a3765b5..eaf50fd 100644
--- a/ansible/roles/gsm-tester/tasks/main.yml
+++ b/ansible/roles/gsm-tester/tasks/main.yml
@@ -216,6 +216,7 @@
- python3-yaml
- python3-mako
- python3-gi
+ - python3-watchdog
- python3-numpy
- python3-websocket
- ofono
diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml
index 8e30cbf..75969e2 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml
@@ -16,11 +16,11 @@
- name: add apt.key
apt_key:
- url: https://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/Release.key
+ url: https://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_{{ ansible_distribution_version}}/Release.key
- name: add apt repository
apt_repository:
- repo: "deb http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/ ./"
+ repo: "deb http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_{{ ansible_distribution_version }}/ ./"
filename: obs_osmocom
update_cache: yes
@@ -30,10 +30,14 @@
update_cache: yes
cache_valid_time: 3600
+- name: Get DEB architecture
+ shell: dpkg --print-architecture
+ register: deb_architecture
+
- name: Install libfftranscode0
apt:
- deb: https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode0_0.1_amd64.deb
+ deb: https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode0_0.3_{{deb_architecture.stdout}}.deb
- name: Install libfftranscode-dev
apt:
- deb: https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode-dev_0.1_amd64.deb
+ deb: https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode-dev_0.3_{{deb_architecture.stdout}}.deb
diff --git a/ansible/roles/podman/tasks/debian.yml b/ansible/roles/podman/tasks/debian.yml
new file mode 100644
index 0000000..907d75c
--- /dev/null
+++ b/ansible/roles/podman/tasks/debian.yml
@@ -0,0 +1,33 @@
+---
+
+- name: add apt https support
+ apt:
+ cache_valid_time: 3600
+ update_cache: yes
+ pkg:
+ - apt-transport-https
+ - gnupg
+ - cron
+ - ca-certificates
+ when: ansible_distribution_major_version < 11
+
+- name: add docker gpg key to apt keyring
+ apt_key:
+ id: 2472D6D0D2F66AF87ABA8DA34D64390375060AA4
+ url: https://ftp.uni-stuttgart.de/opensuse/repositories/devel:/kubic:/libcontainers:/stable/Debian_{{ ansible_distribution_version }}/Release.key
+ when: ansible_distribution_major_version < 11
+
+- apt_repository:
+ repo: "deb https://ftp.uni-stuttgart.de/opensuse/repositories/devel:/kubic:/libcontainers:/stable/Debian_{{ ansible_distribution_version }}/ /"
+ state: present
+ update_cache: yes
+ when: ansible_distribution_major_version < 11
+
+- name: install podman
+ apt:
+ pkg:
+ - podman
+ - runc
+ - buildah
+ - skopeo
+ - dnsmasq
diff --git a/ansible/roles/podman/tasks/main.yml b/ansible/roles/podman/tasks/main.yml
new file mode 100644
index 0000000..049f5c2
--- /dev/null
+++ b/ansible/roles/podman/tasks/main.yml
@@ -0,0 +1,7 @@
+---
+
+- name: Include tasks for Debian
+ include_tasks: debian.yml
+ when: (ansible_distribution in ['Debian', 'Raspbian'])
+
+# TODO: add other distributions below
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 486ecd3..8d3efc7 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -6,7 +6,7 @@
# following default values can be overridden by each repo
disabled: false
concurrent: true
- node: osmocom-gerrit-debian8
+ node: osmocom-gerrit-debian9
# axes related defaults
slave_axis: !!python/tuple [osmocom-gerrit-debian9]
a1_name: a1
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 47a9eea..a7f4f30 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -5,7 +5,7 @@
# following default values can be overridden by each repo
disabled: false
concurrent: true
- node: 'osmocom-master-debian8'
+ node: 'osmocom-master-debian9'
# axes related defaults
slave_axis: !!python/tuple [osmocom-master-debian9]
a1_name: a1
@@ -184,9 +184,9 @@
a3_name: WITH_MANUALS
a3: !!python/tuple ["1", "0"]
combination_filter: >
- (FIRMWARE_VERSION == "master" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
+ (FIRMWARE_VERSION == "master" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||
(FIRMWARE_VERSION == "master" && BTS_MODEL == "trx" && WITH_MANUALS == "0" && label == "rpi4-deb9build-ansible") ||
- (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && WITH_MANUALS == "1" && label == "osmocom-master-debian9") ||
+ (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
(FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
(FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
(FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && WITH_MANUALS == "0" && label == "osmocom-master-debian9") ||
diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml
index becb846..8152d63 100644
--- a/jobs/osmocom-obs.yml
+++ b/jobs/osmocom-obs.yml
@@ -36,7 +36,7 @@
git-config-name: 'Jenkins Builder'
git-config-email: 'jenkins@osmocom.org'
triggers:
- - timed: "H 01 * * *" # run before osmocom-debian-install.yml
+ - timed: "H 00 * * *" # run before osmocom-debian-install.yml
publishers:
- email:
diff --git a/jobs/registry-update-base-images.yml b/jobs/registry-update-base-images.yml
new file mode 100644
index 0000000..e036799
--- /dev/null
+++ b/jobs/registry-update-base-images.yml
@@ -0,0 +1,37 @@
+---
+- project:
+ name: registry-update-base-images
+ jobs:
+ - registry-update-base-images
+
+- job:
+ name: registry-update-base-images
+ description: |
+ Update base docker images in our private reigstry.osmocom.org with those from docker.io
+ Related:<br>
+ <ul>
+ <li> <a href="https://osmocom.org/issues/3839">OS#4839</a>
+ </ul>
+ node: osmocom-master-debian9
+ builders:
+ - shell: |
+ REGISTRY="registry.osmocom.org"
+ IMAGES="debian:stretch debian:buster debian:jessie debian:sid ubuntu:zesty centos:centos8"
+ for i in $IMAGES; do
+ src=$i
+ dst=${REGISTRY}/$i
+ echo
+ echo ======= $src
+ docker pull $src
+ docker tag $src $dst
+ docker push $dst
+ done
+ triggers:
+ - timed: "@daily"
+
+ publishers:
+ - email:
+ notify-every-unstable-build: true
+ recipients: 'jenkins-notifications@lists.osmocom.org'
+
+# vim: expandtab tabstop=2 shiftwidth=2
diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml
index 2dd504f..2102c1e 100644
--- a/jobs/ttcn3-testsuites.yml
+++ b/jobs/ttcn3-testsuites.yml
@@ -65,6 +65,9 @@
- ttcn3-smlc-test:
blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*"
timer: 10 10 * * *
+ - ttcn3-gbproxy-test:
+ blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*"
+ timer: 20 10 * * *
# debian-stretch latest stable
- nplab-m3ua-test-latest:
@@ -121,6 +124,9 @@
#- ttcn3-smlc-test:
# blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*"
# timer: 10 10 * * *
+ - ttcn3-gbproxy-test-latest:
+ blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*"
+ timer: 20 10 * * *
# Jobs below use uppercase TTCN3-$DISTRO, so they get listed separately from the ttcn3-* (debian-stretch) jobs
@@ -170,6 +176,10 @@
#- ttcn3-smlc-test:
# blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*"
# timer: 10 10 * * *
+ - TTCN3-centos-gbproxy-test:
+ blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*"
+ timer: 20 10 * * *
+
- job-template:
name: '{job-name}'
@@ -196,6 +206,7 @@
builders:
- shell: |-
+ export REGISTRY_HOST="registry.osmocom.org"
case "{job-name}" in
TTCN3-centos-*-latest)
cd "$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/ | sed s/\-latest$//)"
diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml
index 16c4ceb..ca99466 100644
--- a/jobs/update-osmo-ci-on-slaves.yml
+++ b/jobs/update-osmo-ci-on-slaves.yml
@@ -7,11 +7,8 @@
name: label
values:
- simtester
- - admin2-deb8build
- admin2-deb9build
- - host2-deb8build-ansible
- host2-deb9build-ansible
- - build2-deb8build-ansible
- build2-deb9build-ansible
- build2-deb10build-ansible
- rpi4-deb9build-ansible
diff --git a/jobs/update-osmo-python-on-slaves.yml b/jobs/update-osmo-python-on-slaves.yml
index ab433a6..6eaa73a 100644
--- a/jobs/update-osmo-python-on-slaves.yml
+++ b/jobs/update-osmo-python-on-slaves.yml
@@ -6,11 +6,8 @@
type: slave
name: label
values:
- - admin2-deb8build
- admin2-deb9build
- - host2-deb8build-ansible
- host2-deb9build-ansible
- - build2-deb8build-ansible
- build2-deb9build-ansible
- build2-deb10build-ansible
- rpi4-deb9build-ansible