[MERGED] osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-04-06 Thread Harald Welte 
Harald Welte has submitted this change and it was merged.

Change subject: jenkins: add job osmo-gsm-tester_gerrit
..


jenkins: add job osmo-gsm-tester_gerrit

The job verifies the gerrit patchset.

Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
---
M jobs/osmo-gsm-tester-runner.yml
A jobs/osmo-gsm-tester_run-gerrit.sh
2 files changed, 64 insertions(+), 0 deletions(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Neels Hofmeyr: Looks good to me, approved
  Harald Welte: Verified



diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml
index 5221b9a..5e1ff92 100644
--- a/jobs/osmo-gsm-tester-runner.yml
+++ b/jobs/osmo-gsm-tester-runner.yml
@@ -6,6 +6,23 @@
   - rnd
 jobs:
   - 'osmo-gsm-tester_run-{stage}'
+  - 'osmo-gsm-tester_gerrit'
+
+- scm:
+name: osmo-gsm-tester-gerrit
+scm:
+  - git:
+  url: ssh://jenk...@gerrit.osmocom.org:29418/osmo-gsm-tester
+  credentials-id: d5eda5e9-b59d-44ba-88d2-43473cb6e42d
+  branches:
+- $GERRIT_BRANCH
+  refspec: $GERRIT_REFSPEC
+  wipe-workspace: false
+  skip-tag: true
+  basedir: osmo-gsm-tester
+  clean:
+before: true
+  choosing-strategy: 'gerrit'
 
 # The repo must be used seperate to workaround the bug "Can not expand 
OSMO_GSM_TESTER_BRANCH".
 # The safe-guard check to not use un-defined variables seems to be broken.
@@ -116,3 +133,36 @@
   notify-every-unstable-build: true
 scm:
   - 'osmo-gsm-tester-repo'
+
+# gerrit job
+- job:
+name: 'osmo-gsm-tester_gerrit'
+defaults: runner
+scm:
+  - 'osmo-gsm-tester-gerrit'
+triggers:
+  - gerrit:
+  server-name: 'gerrit.osmocom.org'
+  trigger-on:
+- patchset-created-event:
+exclude-no-code-change: true
+- draft-published-event
+  projects:
+- project-compare-type: 'PLAIN'
+  project-pattern: 'osmo-gsm-tester'
+  branches:
+- branch-compare-type: 'ANT'
+  branch-pattern: '**'
+builders:
+  - shell: |
+  # make sure no bin artifacts from a previous run remain
+  rm -f *.tgz *.md5
+  - copy_artifact_all
+  - shell: !include-raw: osmo-gsm-tester_run-gerrit.sh
+publishers:
+  - archive:
+  artifacts: '*-run.tgz, *-bin.tgz'
+  default-excludes: false
+  - junit:
+  results: 'trial-*/last_run/trial-*.xml'
+  allow-empty-results: true
diff --git a/jobs/osmo-gsm-tester_run-gerrit.sh 
b/jobs/osmo-gsm-tester_run-gerrit.sh
new file mode 100644
index 000..6d33490
--- /dev/null
+++ b/jobs/osmo-gsm-tester_run-gerrit.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e -x
+
+# On our hardware, we actually use the example configuration as-is.
+export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/example"
+
+# debug: provoke a failure
+#export OSMO_GSM_TESTER_OPTS="-s debug -t fail"
+
+unlink osmo-gsm-tester/example/resources.conf || true
+ln -s resources.conf.prod osmo-gsm-tester/example/resources.conf
+
+export OSMO_GSM_TESTER_OPTS="-s sms:sysmo -s aoip_sms:sysmo -s gprs:sysmo"
+./osmo-gsm-tester/contrib/jenkins-make-check-and-run.sh

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 9
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus

osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-04-06 Thread Harald Welte 

Patch Set 8: Verified+1

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 8
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-30 Thread Neels Hofmeyr 

Patch Set 8: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 8
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-27 Thread lynxis lazus 

Patch Set 7:

(1 comment)

https://gerrit.osmocom.org/#/c/7022/7/jobs/osmo-gsm-tester-runner.yml
File jobs/osmo-gsm-tester-runner.yml:

Line 40: - builder:
it would mean, I've to doublicate the blocks copy_artifact and 
copy_artifact_all and the defaults runner


-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 7
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: Yes

osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-27 Thread Neels Hofmeyr 

Patch Set 7: Code-Review-1

hmm, I prefer to have gerrit verification jobs in an independent yml file, like 
we do so far with the other jjb files. This seems to anyway not use anything of 
the existing bits in the yml file, just adds another job below/in-between the 
other defs? Do you agree?

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 7
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-27 Thread Pau Espin Pedrol 

Patch Set 7: Code-Review+1

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 7
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

[PATCH] osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-27 Thread lynxis lazus 
Hello Pau Espin Pedrol, Neels Hofmeyr, Harald Welte,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/7022

to look at the new patch set (#7).

jenkins: add job osmo-gsm-tester_gerrit

The job verifies the gerrit patchset.

Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
---
M jobs/osmo-gsm-tester-runner.yml
A jobs/osmo-gsm-tester_run-gerrit.sh
2 files changed, 64 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/7022/7

diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml
index 5221b9a..5e1ff92 100644
--- a/jobs/osmo-gsm-tester-runner.yml
+++ b/jobs/osmo-gsm-tester-runner.yml
@@ -6,6 +6,23 @@
   - rnd
 jobs:
   - 'osmo-gsm-tester_run-{stage}'
+  - 'osmo-gsm-tester_gerrit'
+
+- scm:
+name: osmo-gsm-tester-gerrit
+scm:
+  - git:
+  url: ssh://jenk...@gerrit.osmocom.org:29418/osmo-gsm-tester
+  credentials-id: d5eda5e9-b59d-44ba-88d2-43473cb6e42d
+  branches:
+- $GERRIT_BRANCH
+  refspec: $GERRIT_REFSPEC
+  wipe-workspace: false
+  skip-tag: true
+  basedir: osmo-gsm-tester
+  clean:
+before: true
+  choosing-strategy: 'gerrit'
 
 # The repo must be used seperate to workaround the bug "Can not expand 
OSMO_GSM_TESTER_BRANCH".
 # The safe-guard check to not use un-defined variables seems to be broken.
@@ -116,3 +133,36 @@
   notify-every-unstable-build: true
 scm:
   - 'osmo-gsm-tester-repo'
+
+# gerrit job
+- job:
+name: 'osmo-gsm-tester_gerrit'
+defaults: runner
+scm:
+  - 'osmo-gsm-tester-gerrit'
+triggers:
+  - gerrit:
+  server-name: 'gerrit.osmocom.org'
+  trigger-on:
+- patchset-created-event:
+exclude-no-code-change: true
+- draft-published-event
+  projects:
+- project-compare-type: 'PLAIN'
+  project-pattern: 'osmo-gsm-tester'
+  branches:
+- branch-compare-type: 'ANT'
+  branch-pattern: '**'
+builders:
+  - shell: |
+  # make sure no bin artifacts from a previous run remain
+  rm -f *.tgz *.md5
+  - copy_artifact_all
+  - shell: !include-raw: osmo-gsm-tester_run-gerrit.sh
+publishers:
+  - archive:
+  artifacts: '*-run.tgz, *-bin.tgz'
+  default-excludes: false
+  - junit:
+  results: 'trial-*/last_run/trial-*.xml'
+  allow-empty-results: true
diff --git a/jobs/osmo-gsm-tester_run-gerrit.sh 
b/jobs/osmo-gsm-tester_run-gerrit.sh
new file mode 100644
index 000..6d33490
--- /dev/null
+++ b/jobs/osmo-gsm-tester_run-gerrit.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e -x
+
+# On our hardware, we actually use the example configuration as-is.
+export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/example"
+
+# debug: provoke a failure
+#export OSMO_GSM_TESTER_OPTS="-s debug -t fail"
+
+unlink osmo-gsm-tester/example/resources.conf || true
+ln -s resources.conf.prod osmo-gsm-tester/example/resources.conf
+
+export OSMO_GSM_TESTER_OPTS="-s sms:sysmo -s aoip_sms:sysmo -s gprs:sysmo"
+./osmo-gsm-tester/contrib/jenkins-make-check-and-run.sh

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 7
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus

osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-16 Thread Pau Espin Pedrol 

Patch Set 6: Code-Review+1

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 6
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-16 Thread Harald Welte 

Patch Set 6: Code-Review+1

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 6
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

[PATCH] osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-11 Thread lynxis lazus 
Hello Pau Espin Pedrol, Neels Hofmeyr,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/7022

to look at the new patch set (#6).

jenkins: add job osmo-gsm-tester_gerrit

The job verifies the gerrit patchset.

Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
---
M jobs/osmo-gsm-tester-runner.yml
A jobs/osmo-gsm-tester_run-gerrit.sh
2 files changed, 69 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/7022/6

diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml
index 97fd482..37e1651 100644
--- a/jobs/osmo-gsm-tester-runner.yml
+++ b/jobs/osmo-gsm-tester-runner.yml
@@ -6,6 +6,22 @@
   - rnd
 jobs:
   - 'osmo-gsm-tester_run-{stage}'
+  - 'osmo-gsm-tester_gerrit'
+
+- scm:
+name: osmo-gsm-tester-gerrit
+scm:
+  - git:
+  url: ssh://jenk...@gerrit.osmocom.org:29418/osmo-gsm-tester
+  credentials-id: jenkins
+  branches:
+- $GERRIT_BRANCH
+  wipe-workspace: false
+  skip-tag: true
+  basedir: osmo-gsm-tester
+  clean:
+before: true
+  choosing-strategy: 'gerrit'
 
 # The repo must be used seperate to workaround the bug "Can not expand 
OSMO_GSM_TESTER_BRANCH".
 # The safe-guard check to not use un-defined variables seems to be broken.
@@ -116,3 +132,37 @@
   notify-every-unstable-build: true
 scm:
   - 'osmo-gsm-tester-repo'
+
+# gerrit job
+- job:
+name: 'osmo-gsm-tester_gerrit'
+defaults: runner
+scm:
+  - 'osmo-gsm-tester-gerrit'
+triggers:
+  - gerrit:
+  server-name: 'gerrit.osmocom.org'
+  trigger-on:
+- patchset-created-event:
+exclude-no-code-change: true
+- draft-published-event
+  projects:
+- project-compare-type: 'PLAIN'
+  project-pattern: 'osmo-gsm-tester'
+  branches:
+- branch-compare-type: 'ANT'
+  branch-pattern: '**'
+builders:
+  - shell: |
+  # make sure no bin artifacts from a previous run remain
+  rm -f *.tgz *.md5
+  - osmo_gsm_copy_artifact_all
+  - shell: !include-raw: osmo-gsm-tester_run-gerrit.sh
+publishers:
+  - archive:
+  artifacts: '*-run.tgz, *-bin.tgz'
+  default-excludes: false
+  - junit:
+  results: 'trial-*/last_run/trial-*.xml'
+  allow-empty-results: true
+
diff --git a/jobs/osmo-gsm-tester_run-gerrit.sh 
b/jobs/osmo-gsm-tester_run-gerrit.sh
new file mode 100644
index 000..b07207f
--- /dev/null
+++ b/jobs/osmo-gsm-tester_run-gerrit.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e -x
+
+# On our hardware, we actually use the example configuration as-is.
+export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/example"
+
+# debug: provoke a failure
+#export OSMO_GSM_TESTER_OPTS="-s debug -t fail"
+
+# TMP fix: prod main unit has sierra_2 and _3 instead of _1 and _2
+sed -i 
"s#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.3#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.3#g"
 "$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i 
"s#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.2#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.2#g"
 "$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#90170009031#90170015252#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#90170009029#90170015253#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#80A37E6FDEA931EAC92FFA5F671EFEAD#EBAB63D06C3F546A16C977CB40E57C68#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#00969E283349D354A8239E877F2E0866#EBD2B5F6CF3374106D0A66C11F922001#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+
+export OSMO_GSM_TESTER_OPTS="-s sms:sysmo -s aoip_sms:sysmo -s gprs:sysmo"
+./osmo-gsm-tester/contrib/jenkins-make-check-and-run.sh

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 6
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus

osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-11 Thread lynxis lazus 

Patch Set 5:

Just noticed, I didn't use the scm in the gerrit job...

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 5
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-11 Thread lynxis lazus 

Patch Set 5:

(1 comment)

https://gerrit.osmocom.org/#/c/7022/5/jobs/osmo-gsm-tester.yml
File jobs/osmo-gsm-tester.yml:

Line 101: - scm:
> Is this adding the gerrit-URL osmo-gsm-tester *over* the git.osmocom.org on
@Neels: this just defines a scm, which you can use in an actual job. For that 
reason, it has a name argument.
I agree, jjb has a different writing and reading than a lot other template 
engines and code.
I could move all "runners" (gerrit, rnd, prod) into a new file, if that makes 
it easier for you to read.


-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 5
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: Yes

osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-06 Thread Pau Espin Pedrol 

Patch Set 5: Code-Review+1

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 5
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

[PATCH] osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-06 Thread lynxis lazus 
Hello Pau Espin Pedrol,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/7022

to look at the new patch set (#4).

jenkins: add job osmo-gsm-tester_gerrit

The job verifies the gerrit patchset.

Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
---
M jobs/osmo-gsm-tester.yml
A jobs/osmo-gsm-tester_gerrit.sh
2 files changed, 63 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/7022/4

diff --git a/jobs/osmo-gsm-tester.yml b/jobs/osmo-gsm-tester.yml
index 42c2f83..7db05c0 100644
--- a/jobs/osmo-gsm-tester.yml
+++ b/jobs/osmo-gsm-tester.yml
@@ -1,6 +1,5 @@
 ---
 #TODO:
-#  - gerrit
 #  - manual-run
 #
 - project:
@@ -99,6 +98,19 @@
   wipe-workspace: false
   skip-tag: true
   basedir: osmo-gsm-tester
+- scm:
+name: osmo-gsm-tester-gerrit
+scm:
+  - git:
+  url: ssh://jenk...@gerrit.osmocom.org:29418/osmo-gsm-tester
+  credentials-id: jenkins
+  branches:
+- $GERRIT_BRANCH
+  wipe-workspace: false
+  skip-tag: true
+  basedir: osmo-gsm-tester
+  clean:  true
+  choosing-strategy: 'gerrit'
 
 ## trigger build job
 - job:
@@ -120,6 +132,7 @@
   node: 'osmo-gsm-tester-rnd'
 jobs:
   - 'osmo-gsm-tester_run-{stage}'
+  - 'osmo-gsm-tester_gerrit'
 
 - builder:
 name: osmo_gsm_copy_artifact
@@ -179,6 +192,36 @@
   default: ""
   description: "pass additional command line options to 
osmo-gsm-tester.py, e.g. to select specific suites:scenarios. Default: leave 
empty."
 
+- job:
+name: 'osmo-gsm-tester_gerrit'
+defaults: runner
+triggers:
+  - gerrit:
+  server-name: 'gerrit.osmocom.org'
+  trigger-on:
+- patchset-created-event:
+exclude-no-code-change: true
+- draft-published-event
+  projects:
+- project-compare-type: 'PLAIN'
+  project-pattern: 'osmo-gsm-tester'
+  branches:
+- branch-compare-type: 'ANT'
+  branch-pattern: '**'
+builders:
+  - shell: |
+  # make sure no bin artifacts from a previous run remain
+  rm -f *.tgz *.md5
+  - osmo_gsm_copy_artifact_all
+  - shell: !include-raw osmo-gsm-tester_gerrit.sh
+publishers:
+  - archive:
+  artifacts: '*-run.tgz, *-bin.tgz'
+  default-excludes: false
+  - junit:
+  results: 'trial-*/last_run/trial-*.xml'
+  allow-empty-results: true
+
 - job-template:
 name: 'osmo-gsm-tester_run-{stage}'
 defaults: runner
diff --git a/jobs/osmo-gsm-tester_gerrit.sh b/jobs/osmo-gsm-tester_gerrit.sh
new file mode 100644
index 000..b07207f
--- /dev/null
+++ b/jobs/osmo-gsm-tester_gerrit.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e -x
+
+# On our hardware, we actually use the example configuration as-is.
+export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/example"
+
+# debug: provoke a failure
+#export OSMO_GSM_TESTER_OPTS="-s debug -t fail"
+
+# TMP fix: prod main unit has sierra_2 and _3 instead of _1 and _2
+sed -i 
"s#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.3#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.3#g"
 "$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i 
"s#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.2#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.2#g"
 "$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#90170009031#90170015252#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#90170009029#90170015253#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#80A37E6FDEA931EAC92FFA5F671EFEAD#EBAB63D06C3F546A16C977CB40E57C68#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#00969E283349D354A8239E877F2E0866#EBD2B5F6CF3374106D0A66C11F922001#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+
+export OSMO_GSM_TESTER_OPTS="-s sms:sysmo -s aoip_sms:sysmo -s gprs:sysmo"
+./osmo-gsm-tester/contrib/jenkins-make-check-and-run.sh

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 4
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus

osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-06 Thread Pau Espin Pedrol 

Patch Set 3: Code-Review+1

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

[PATCH] osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-05 Thread lynxis lazus 

jenkins: add job osmo-gsm-tester_gerrit

The job verifies the gerrit patchset.

Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
---
M jobs/osmo-gsm-tester.yml
A jobs/osmo-gsm-tester_gerrit.sh
2 files changed, 63 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/7022/3

diff --git a/jobs/osmo-gsm-tester.yml b/jobs/osmo-gsm-tester.yml
index 41a7ec1..74d28eb 100644
--- a/jobs/osmo-gsm-tester.yml
+++ b/jobs/osmo-gsm-tester.yml
@@ -1,7 +1,6 @@
 ---
 #TODO:
 #  - trigger
-#  - gerrit
 #  - manual-run
 #
 - project:
@@ -100,6 +99,19 @@
   wipe-workspace: false
   skip-tag: true
   basedir: osmo-gsm-tester
+- scm:
+name: osmo-gsm-tester-gerrit
+scm:
+  - git:
+  url: ssh://jenk...@gerrit.osmocom.org:29418/osmo-gsm-tester
+  credentials-id: jenkins
+  branches:
+- $GERRIT_BRANCH
+  wipe-workspace: false
+  skip-tag: true
+  basedir: osmo-gsm-tester
+  clean:  true
+  choosing-strategy: 'gerrit'
 
 - scm:
 name: osmo-gsm-tester-repo-clean
@@ -133,6 +145,7 @@
   node: 'osmo-gsm-tester-rnd'
 jobs:
   - 'osmo-gsm-tester_run-{stage}'
+  - 'osmo-gsm-tester_gerrit'
 
 - builder:
 name: osmo_gsm_copy_artifact
@@ -192,6 +205,36 @@
   default: ""
   description: "pass additional command line options to 
osmo-gsm-tester.py, e.g. to select specific suites:scenarios. Default: leave 
empty."
 
+- job:
+name: 'osmo-gsm-tester_gerrit'
+defaults: runner
+triggers:
+  - gerrit:
+  server-name: 'gerrit.osmocom.org'
+  trigger-on:
+- patchset-created-event:
+exclude-no-code-change: true
+- draft-published-event
+  projects:
+- project-compare-type: 'PLAIN'
+  project-pattern: 'osmo-gsm-tester'
+  branches:
+- branch-compare-type: 'ANT'
+  branch-pattern: '**'
+builders:
+  - shell: |
+  # make sure no bin artifacts from a previous run remain
+  rm -f *.tgz *.md5
+  - osmo_gsm_copy_artifact_all
+  - shell: !include-raw osmo-gsm-tester_gerrit.sh
+publishers:
+  - archive:
+  artifacts: '*-run.tgz, *-bin.tgz'
+  default-excludes: false
+  - junit:
+  results: 'trial-*/last_run/trial-*.xml'
+  allow-empty-results: true
+
 - job-template:
 name: 'osmo-gsm-tester_run-{stage}'
 defaults: runner
diff --git a/jobs/osmo-gsm-tester_gerrit.sh b/jobs/osmo-gsm-tester_gerrit.sh
new file mode 100644
index 000..b07207f
--- /dev/null
+++ b/jobs/osmo-gsm-tester_gerrit.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e -x
+
+# On our hardware, we actually use the example configuration as-is.
+export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/example"
+
+# debug: provoke a failure
+#export OSMO_GSM_TESTER_OPTS="-s debug -t fail"
+
+# TMP fix: prod main unit has sierra_2 and _3 instead of _1 and _2
+sed -i 
"s#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.3#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.3#g"
 "$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i 
"s#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.2#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.2#g"
 "$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#90170009031#90170015252#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#90170009029#90170015253#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#80A37E6FDEA931EAC92FFA5F671EFEAD#EBAB63D06C3F546A16C977CB40E57C68#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#00969E283349D354A8239E877F2E0866#EBD2B5F6CF3374106D0A66C11F922001#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+
+export OSMO_GSM_TESTER_OPTS="-s sms:sysmo -s aoip_sms:sysmo -s gprs:sysmo"
+./osmo-gsm-tester/contrib/jenkins-make-check-and-run.sh

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus

[PATCH] osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-05 Thread lynxis lazus 

jenkins: add job osmo-gsm-tester_gerrit

The job verifies the gerrit patchset.

Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
---
M jobs/osmo-gsm-tester.yml
A jobs/osmo-gsm-tester_gerrit.sh
2 files changed, 63 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/7022/2

diff --git a/jobs/osmo-gsm-tester.yml b/jobs/osmo-gsm-tester.yml
index 41a7ec1..1013ef8 100644
--- a/jobs/osmo-gsm-tester.yml
+++ b/jobs/osmo-gsm-tester.yml
@@ -1,7 +1,6 @@
 ---
 #TODO:
 #  - trigger
-#  - gerrit
 #  - manual-run
 #
 - project:
@@ -100,6 +99,19 @@
   wipe-workspace: false
   skip-tag: true
   basedir: osmo-gsm-tester
+- scm:
+name: osmo-gsm-tester-gerrit
+scm:
+  - git:
+  url: ssh://jenk...@gerrit.osmocom.org:29418/osmo-gsm-tester
+  credentials-id: jenkins
+  branches:
+- $GERRIT_BRANCH
+  wipe-workspace: false
+  skip-tag: true
+  basedir: osmo-gsm-tester
+  clean:  true
+  choosing-strategy: 'gerrit'
 
 - scm:
 name: osmo-gsm-tester-repo-clean
@@ -133,6 +145,7 @@
   node: 'osmo-gsm-tester-rnd'
 jobs:
   - 'osmo-gsm-tester_run-{stage}'
+  - 'osmo-gsm-tester_gerrit'
 
 - builder:
 name: osmo_gsm_copy_artifact
@@ -192,6 +205,36 @@
   default: ""
   description: "pass additional command line options to 
osmo-gsm-tester.py, e.g. to select specific suites:scenarios. Default: leave 
empty."
 
+- job:
+name: 'osmo-gsm-tester_gerrit'
+defaults: runners
+triggers:
+  - gerrit:
+  server-name: 'gerrit.osmocom.org'
+  trigger-on:
+- patchset-created-event:
+exclude-no-code-change: true
+- draft-published-event
+  projects:
+- project-compare-type: 'PLAIN'
+  project-pattern: 'osmo-gsm-tester'
+  branches:
+- branch-compare-type: 'ANT'
+  branch-pattern: '**'
+builders:
+  - shell: |
+  # make sure no bin artifacts from a previous run remain
+  rm -f *.tgz *.md5
+  - osmo_gsm_copy_artifact_all
+  - shell: !include-raw osmo-gsm-tester_gerrit.sh
+publishers:
+  - archive:
+  artifacts: '*-run.tgz, *-bin.tgz'
+  default-excludes: false
+  - junit:
+  results: 'trial-*/last_run/trial-*.xml'
+  allow-empty-results: true
+
 - job-template:
 name: 'osmo-gsm-tester_run-{stage}'
 defaults: runner
diff --git a/jobs/osmo-gsm-tester_gerrit.sh b/jobs/osmo-gsm-tester_gerrit.sh
new file mode 100644
index 000..b07207f
--- /dev/null
+++ b/jobs/osmo-gsm-tester_gerrit.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e -x
+
+# On our hardware, we actually use the example configuration as-is.
+export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/example"
+
+# debug: provoke a failure
+#export OSMO_GSM_TESTER_OPTS="-s debug -t fail"
+
+# TMP fix: prod main unit has sierra_2 and _3 instead of _1 and _2
+sed -i 
"s#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.3#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.3#g"
 "$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i 
"s#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.2#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.2#g"
 "$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#90170009031#90170015252#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#90170009029#90170015253#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#80A37E6FDEA931EAC92FFA5F671EFEAD#EBAB63D06C3F546A16C977CB40E57C68#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#00969E283349D354A8239E877F2E0866#EBD2B5F6CF3374106D0A66C11F922001#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+
+export OSMO_GSM_TESTER_OPTS="-s sms:sysmo -s aoip_sms:sysmo -s gprs:sysmo"
+./osmo-gsm-tester/contrib/jenkins-make-check-and-run.sh

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus

osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-05 Thread Pau Espin Pedrol 

Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/7022/1/jobs/osmo-gsm-tester.yml
File jobs/osmo-gsm-tester.yml:

Line 238:   only-if-success: 'true'
We want to store artifacts if it fails, to be able to spot issues from them.


-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: Yes

osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-01 Thread lynxis lazus 

Patch Set 1:

This job hasn't been yet deployed on the jenkins.

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: lynxis lazus 
Gerrit-HasComments: No

[PATCH] osmo-ci[master]: jenkins: add job osmo-gsm-tester_gerrit

2018-03-01 Thread lynxis lazus 

Review at  https://gerrit.osmocom.org/7022

jenkins: add job osmo-gsm-tester_gerrit

The job verifies the gerrit patchset.

Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
---
M jobs/osmo-gsm-tester.yml
A jobs/osmo-gsm-tester_gerrit.sh
2 files changed, 64 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/7022/1

diff --git a/jobs/osmo-gsm-tester.yml b/jobs/osmo-gsm-tester.yml
index 0380f13..afb324a 100644
--- a/jobs/osmo-gsm-tester.yml
+++ b/jobs/osmo-gsm-tester.yml
@@ -1,7 +1,6 @@
 ---
 #TODO:
 #  - trigger
-#  - gerrit
 #  - manual-run
 #
 - project:
@@ -105,6 +104,19 @@
   wipe-workspace: false
   skip-tag: true
   basedir: osmo-gsm-tester
+- scm:
+name: osmo-gsm-tester-gerrit
+scm:
+  - git:
+  url: ssh://jenk...@gerrit.osmocom.org:29418/osmo-gsm-tester
+  credentials-id: jenkins
+  branches:
+- $GERRIT_BRANCH
+  wipe-workspace: false
+  skip-tag: true
+  basedir: osmo-gsm-tester
+  clean:  true
+  choosing-strategy: 'gerrit'
 
 - scm:
 name: osmo-gsm-tester-repo-clean
@@ -138,6 +150,7 @@
   node: 'osmo-gsm-tester-rnd'
 jobs:
   - 'osmo-gsm-tester_run-{stage}'
+  - 'osmo-gsm-tester_gerrit'
 
 - builder:
 name: osmo_gsm_copy_artifact
@@ -197,6 +210,37 @@
   default: ""
   description: "pass additional command line options to 
osmo-gsm-tester.py, e.g. to select specific suites:scenarios. Default: leave 
empty."
 
+- job:
+name: 'osmo-gsm-tester_gerrit'
+defaults: runners
+triggers:
+  - gerrit:
+  server-name: 'gerrit.osmocom.org'
+  trigger-on:
+- patchset-created-event:
+exclude-no-code-change: true
+- draft-published-event
+  projects:
+- project-compare-type: 'PLAIN'
+  project-pattern: 'osmo-gsm-tester'
+  branches:
+- branch-compare-type: 'ANT'
+  branch-pattern: '**'
+builders:
+  - shell: |
+  # make sure no bin artifacts from a previous run remain
+  rm -f *.tgz *.md5
+  - osmo_gsm_copy_artifact_all
+  - shell: !include-raw osmo-gsm-tester_gerrit.sh
+publishers:
+  - archive:
+  artifacts: '*-run.tgz, *-bin.tgz'
+  only-if-success: 'true'
+  default-excludes: false
+  - junit:
+  results: 'trial-*/last_run/trial-*.xml'
+  allow-empty-results: true
+
 - job-template:
 name: 'osmo-gsm-tester_run-{stage}'
 defaults: runners
diff --git a/jobs/osmo-gsm-tester_gerrit.sh b/jobs/osmo-gsm-tester_gerrit.sh
new file mode 100644
index 000..b07207f
--- /dev/null
+++ b/jobs/osmo-gsm-tester_gerrit.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e -x
+
+# On our hardware, we actually use the example configuration as-is.
+export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/example"
+
+# debug: provoke a failure
+#export OSMO_GSM_TESTER_OPTS="-s debug -t fail"
+
+# TMP fix: prod main unit has sierra_2 and _3 instead of _1 and _2
+sed -i 
"s#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.3#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.3#g"
 "$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i 
"s#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.2#/sys/devices/pci:00/:00:12.2/usb1/1-1/1-1.7/1-1.7.2#g"
 "$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#90170009031#90170015252#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#90170009029#90170015253#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#80A37E6FDEA931EAC92FFA5F671EFEAD#EBAB63D06C3F546A16C977CB40E57C68#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+sed -i "s#00969E283349D354A8239E877F2E0866#EBD2B5F6CF3374106D0A66C11F922001#g" 
"$OSMO_GSM_TESTER_CONF/resources.conf"
+
+export OSMO_GSM_TESTER_OPTS="-s sms:sysmo -s aoip_sms:sysmo -s gprs:sysmo"
+./osmo-gsm-tester/contrib/jenkins-make-check-and-run.sh

-- 
To view, visit https://gerrit.osmocom.org/7022
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If661675528059bc8a95d39a6489a5a9381f52677
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus