Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ci/+/42961?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: contrib/obs-mirror: log to systemd journal
......................................................................
contrib/obs-mirror: log to systemd journal
Instead of having a lot of logfiles in /home/pkgmirror and starting the
obs-mirror scripts via cronjob, add systemd services and timers and let
them log to the systemd journal.
Change-Id: I3a567770ef6d98bb3fdc2d52214cacbfe59640ad
---
D contrib/obs-mirror/README
A contrib/obs-mirror/README.md
M contrib/obs-mirror/obs-mirror.sh
M contrib/obs-mirror/rm-old-nightly-archives.sh
A contrib/obs-mirror/systemd/obs-mirror.service
A contrib/obs-mirror/systemd/obs-mirror.timer
A contrib/obs-mirror/systemd/rm-old-nightly-archives.service
A contrib/obs-mirror/systemd/rm-old-nightly-archives.timer
8 files changed, 56 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/61/42961/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42961?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I3a567770ef6d98bb3fdc2d52214cacbfe59640ad
Gerrit-Change-Number: 42961
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/42961?usp=email )
Change subject: contrib/obs-mirror: log to systemd journal
......................................................................
contrib/obs-mirror: log to systemd journal
Instead of having a lot of logfiles in /home/pkgmirror and starting the
obs-mirror scripts via cronjob, add systemd services and timers and let
them log to the systemd journal.
Change-Id: I3a567770ef6d98bb3fdc2d52214cacbfe59640ad
---
D contrib/obs-mirror/README
A contrib/obs-mirror/README.md
M contrib/obs-mirror/obs-mirror.sh
M contrib/obs-mirror/rm-old-nightly-archives.sh
A contrib/obs-mirror/systemd/obs-mirror.service
A contrib/obs-mirror/systemd/obs-mirror.timer
A contrib/obs-mirror/systemd/rm-old-nightly-archives.service
A contrib/obs-mirror/systemd/rm-old-nightly-archives.timer
8 files changed, 56 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/61/42961/1
diff --git a/contrib/obs-mirror/README b/contrib/obs-mirror/README
deleted file mode 100644
index 4cab14b..0000000
--- a/contrib/obs-mirror/README
+++ /dev/null
@@ -1,7 +0,0 @@
-The scripts in this directory are used to create an archive of Osmocom related
-packages from OBS, at: https://downloads.osmocom.org/obs-mirror/
-
-There is no mechanism in place to deploy updated scripts after updating them
-here in osmo-ci.git, so this must be done manually.
-
-See OS#4862 for more information.
diff --git a/contrib/obs-mirror/README.md b/contrib/obs-mirror/README.md
new file mode 100644
index 0000000..01c9615
--- /dev/null
+++ b/contrib/obs-mirror/README.md
@@ -0,0 +1,19 @@
+The scripts in this directory are used to create an archive of Osmocom related
+packages from OBS, at: https://downloads.osmocom.org/obs-mirror/
+
+There is no mechanism in place to deploy updated scripts after updating them
+here in osmo-ci.git, so this must be done manually:
+
+```
+$ ssh pkgmirror(a)package-archive.osmocom.org
+pkgmirror@package-archive:~$ git -C osmo-ci pull
+```
+
+After changing the systemd services or timers, deploy them as follows:
+```
+$ scp systemd/* root@package-archive.osmocom.org:/etc/systemd/system
+$ ssh root@@package-archive.osmocom.org
+root@package-archive:~# systemctl daemon-reload
+```
+
+See OS#4862 for more information.
diff --git a/contrib/obs-mirror/obs-mirror.sh b/contrib/obs-mirror/obs-mirror.sh
index 85336ab..090ff26 100755
--- a/contrib/obs-mirror/obs-mirror.sh
+++ b/contrib/obs-mirror/obs-mirror.sh
@@ -9,10 +9,7 @@
#
# See also: OS#4862
-DATE=`date +%Y%m%d-%H%M%S`
-LOGFILE="/home/pkgmirror/obs-mirror-$DATE.log"
-echo "Redirecting all output to: $LOGFILE"
-exec >$LOGFILE 2>&1
+DATE="$(date +%Y%m%d-%H%M%S)"
set -e -x
SCRIPT_DIR="$(realpath "$(dirname "$(realpath "$0")")")"
diff --git a/contrib/obs-mirror/rm-old-nightly-archives.sh b/contrib/obs-mirror/rm-old-nightly-archives.sh
index 485788f..cde4223 100755
--- a/contrib/obs-mirror/rm-old-nightly-archives.sh
+++ b/contrib/obs-mirror/rm-old-nightly-archives.sh
@@ -1,7 +1,5 @@
#!/bin/sh -e
# Remove nightly archives older than one month (OS#4862)
-echo "Redirecting all output to: /home/pkgmirror/rm-old-nightly-archives.log"
-exec >"/home/pkgmirror/rm-old-nightly-archives.log" 2>&1
DRY=0
diff --git a/contrib/obs-mirror/systemd/obs-mirror.service b/contrib/obs-mirror/systemd/obs-mirror.service
new file mode 100644
index 0000000..6a2f8a0
--- /dev/null
+++ b/contrib/obs-mirror/systemd/obs-mirror.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=obs-mirror
+
+[Service]
+Type=oneshot
+User=pkgmirror
+ExecStart=/home/pkgmirror/osmo-ci/contrib/obs-mirror/obs-mirror.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/contrib/obs-mirror/systemd/obs-mirror.timer b/contrib/obs-mirror/systemd/obs-mirror.timer
new file mode 100644
index 0000000..5005e2f
--- /dev/null
+++ b/contrib/obs-mirror/systemd/obs-mirror.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=Run obs-mirror.service
+
+[Timer]
+OnCalendar=*-*-* 06:19:00
+
+[Install]
+WantedBy=timers.target
diff --git a/contrib/obs-mirror/systemd/rm-old-nightly-archives.service b/contrib/obs-mirror/systemd/rm-old-nightly-archives.service
new file mode 100644
index 0000000..57342cc
--- /dev/null
+++ b/contrib/obs-mirror/systemd/rm-old-nightly-archives.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=obs-mirror
+
+[Service]
+Type=oneshot
+User=pkgmirror
+ExecStart=/home/pkgmirror/osmo-ci/contrib/obs-mirror/rm-old-nightly-archives.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/contrib/obs-mirror/systemd/rm-old-nightly-archives.timer b/contrib/obs-mirror/systemd/rm-old-nightly-archives.timer
new file mode 100644
index 0000000..58e8266
--- /dev/null
+++ b/contrib/obs-mirror/systemd/rm-old-nightly-archives.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=Run rm-old-nightly-archives.service
+
+[Timer]
+OnCalendar=*-*-* 07:10:00
+
+[Install]
+WantedBy=timers.target
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42961?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I3a567770ef6d98bb3fdc2d52214cacbfe59640ad
Gerrit-Change-Number: 42961
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Attention is currently required from: jolly.
Hello Jenkins Builder, jolly,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42953?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Code-Review+1 by jolly, Verified+1 by Jenkins Builder
Change subject: eIM, IPAd: migrate from SGP.32 V.1.0.1 to SGP.32 V.1.2
......................................................................
eIM, IPAd: migrate from SGP.32 V.1.0.1 to SGP.32 V.1.2
SGP.32 V.1.2 is not backward compatible to SGP.32 V.1.0.1. This patch updates
the ASN.1 specification and the TTCN3 templates and types accordingly.
It also applies the bare minimum of changes required to compile the eIM and IPAd
testcases.
Related: SYS#8100
Related: SYS#8101
Change-Id: Id9e112669d9ed8caaec0893c55189eb566fe59be
Co-authored-by: Andreas Eversberg <aeversberg(a)sysmocom.de>
---
M .checkpatch.conf
M eim/REST_Types_JSON.ttcn
M eim/eIM_Tests.ttcn
M ipad/IPAd_Tests.ttcn
M library/euicc/SGP32Definitions.asn
M library/euicc/SGP32Definitions_Templates.ttcn
M library/euicc/SGP32Definitions_Types.ttcn
7 files changed, 1,177 insertions(+), 751 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/42953/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42953?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Id9e112669d9ed8caaec0893c55189eb566fe59be
Gerrit-Change-Number: 42953
Gerrit-PatchSet: 3
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/onomondo-eim/+/42960?usp=email )
Change subject: mnesia_db_euicc: rename timer_setparam to timer_rest
......................................................................
mnesia_db_euicc: rename timer_setparam to timer_rest
The function timer_setparam is processing REAT api orders
in regular intervals. Naming the timer "timer_rest" makes
more sense.
Change-Id: Icfa203477e044ce2cc312d4b6e2693a97191c61d
---
M src/mnesia_db.erl
M src/mnesia_db_euicc.erl
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/onomondo-eim refs/changes/60/42960/1
diff --git a/src/mnesia_db.erl b/src/mnesia_db.erl
index cd69e3a..d8e7afa 100644
--- a/src/mnesia_db.erl
+++ b/src/mnesia_db.erl
@@ -109,7 +109,7 @@
{atomic, ok} = mnesia:transaction(Trans),
% Start recurring event cycles
- ok = mnesia_db_euicc:timer_setparam(),
+ ok = mnesia_db_euicc:timer_rest(),
ok = mnesia_db_rest:timer_cleanup(),
ok.
diff --git a/src/mnesia_db_euicc.erl b/src/mnesia_db_euicc.erl
index 138290f..013b377 100644
--- a/src/mnesia_db_euicc.erl
+++ b/src/mnesia_db_euicc.erl
@@ -16,7 +16,7 @@
-export([dump/0]).
% trigger recurring events (called automatically by timer from this module)
--export([timer_setparam/0]).
+-export([timer_rest/0]).
trans_create_if_not_exist(EidValue) ->
{ok, CounterValue} = application:get_env(onomondo_eim, counter_value),
@@ -171,8 +171,8 @@
error
end.
-% Run scheduled eUICC procedures
-timer_setparam() ->
+% Handle REST requests in regular intervals
+timer_rest() ->
% An eUICC procedure in the context of this module has nothing to do with any of the procedures specified in
% GSMA SGP.22 or SGP.32. In this module an eUICC procedure is a virtual procedure were parameters in the
% euicc table are set.
@@ -246,7 +246,7 @@
end,
% Next euicc procedure in 10 secs.
- {ok, _} = timer:apply_after(10000, mnesia_db_euicc, timer_setparam, []),
+ {ok, _} = timer:apply_after(10000, mnesia_db_euicc, timer_rest, []),
ok.
% Dump all eUICCs we are aware of
--
To view, visit https://gerrit.osmocom.org/c/onomondo-eim/+/42960?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: onomondo-eim
Gerrit-Branch: master
Gerrit-Change-Id: Icfa203477e044ce2cc312d4b6e2693a97191c61d
Gerrit-Change-Number: 42960
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>