Change in osmo-ci[master]: jobs/ttcn3: split *-kernel-git to own file

osmith gerrit-no-reply at lists.osmocom.org
Tue Mar 2 13:26:15 UTC 2021


osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23194 )

Change subject: jobs/ttcn3: split *-kernel-git to own file
......................................................................

jobs/ttcn3: split *-kernel-git to own file

Move ttcn3-ggsn-test-kernel-git into its own file, so the parameters
that are only relevant for cloning a kernel from git, do not show up in
all other TTCN-3 jenkins jobs.

Related: OS#3208
Change-Id: Iafbe6139db47c2918dc1fd7c3bacf38da326d9c8
---
A jobs/ttcn3-testsuites-kernel-git.yml
M jobs/ttcn3-testsuites.yml
2 files changed, 116 insertions(+), 38 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  osmith: Verified



diff --git a/jobs/ttcn3-testsuites-kernel-git.yml b/jobs/ttcn3-testsuites-kernel-git.yml
new file mode 100644
index 0000000..90cdae2
--- /dev/null
+++ b/jobs/ttcn3-testsuites-kernel-git.yml
@@ -0,0 +1,116 @@
+# TTCN-3 testsuite jobs with parameters to build a kernel from source (OS#3208)
+---
+- project:
+    name: 'ttcn3-testsuites-kernel-git'
+    concurrent: false
+    disabled: false
+    description: ""
+    timer: "@midnight"
+    node: ttcn3
+    blocking: "^{job-name}.*"
+    wipe_workspace: false
+    jobs:
+      - "{job-name}"
+    # Folders from docker-playground.git
+    job-name:
+      - ttcn3-ggsn-test-kernel-git:
+          blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*"
+          timer: 30 04 * * *
+          # Cache the linux source tree in the workspace of one node
+          node: ttcn3-ggsn-test-kernel-git
+          description: |
+            Test osmo-ggsn master with a kernel built from source (see build
+            parameters, by default: net-next.git from kernel.org).
+
+- job-template:
+    name: '{job-name}'
+    project-type: freestyle
+    disabled: '{obj:disabled}'
+    defaults: global
+    description: '{obj:description}'
+    node: '{obj:node}'
+    parameters:
+      - string:
+          name: BRANCH
+          description: |
+                Branch of <code>docker-playground.git</code>.
+                Only modify if you are hacking on the docker-playground scripts.
+          default: '*/master'
+      - string:
+          name: KERNEL_URL
+          description: |
+                Remote URL of git repository, from which the kernel will be
+                built.
+          default: 'https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git'
+      - string:
+          name: KERNEL_REMOTE_NAME
+          description: |
+                Short name for the remote URL, which will be used to add it to
+                the local git checkout with <code>git remote add</code>.
+          default: 'net-next'
+      - string:
+          name: KERNEL_BRANCH
+          description: |
+                Branch to check out from the remote with
+                <code>KERNEL_URL</code> and <code>KERNEL_REMOTE_NAME</code>
+                before building the kernel.
+          default: 'master'
+
+    builders:
+      - shell: |-
+          export REGISTRY_HOST="registry.osmocom.org"
+
+          # Translate job name to docker-playground dir and relevant
+          # environment variables
+          case "{job-name}" in
+              ttcn3-ggsn-test-kernel-git)
+                  DIR="ttcn3-ggsn-test"
+                  export IMAGE_SUFFIX="master"
+                  export KERNEL_TEST=1
+                  export KERNEL_BUILD=1
+                  ;;
+              *)
+                  echo "Can't handle job: {job-name}"
+                  exit 1
+                  ;;
+          esac
+
+          cd "$DIR"
+          ./jenkins.sh
+    scm:
+      - git:
+          branches:
+            - '$BRANCH'
+          url: git://git.osmocom.org/docker-playground
+          git-config-name: 'Jenkins Builder'
+          git-config-email: 'jenkins at osmocom.org'
+          wipe-workspace: "{obj:wipe_workspace}"
+    triggers:
+      - timed: "{obj:timer}"
+    publishers:
+      - junit:
+          results: '**/junit-xml-*.log'
+          allow-empty-results: false
+      - email:
+          notify-every-unstable-build: true
+          recipients: laforge at gnumonks.org
+          send-to-individuals: false
+      - archive:
+          allow-empty: false
+          artifacts: logs/**/*
+          case-sensitive: true
+          default-excludes: true
+          fingerprint: false
+          only-if-success: false
+    properties:
+    - build-blocker:
+        use-build-blocker: true
+        blocking-jobs:
+          - "{obj:blocking}"
+    - build-discarder:
+        days-to-keep: 30
+        num-to-keep: 120
+        artifact-days-to-keep: -1
+        artifact-num-to-keep: -1
+
+# vim: expandtab tabstop=2 shiftwidth=2
diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml
index 992c75d..53f18c2 100644
--- a/jobs/ttcn3-testsuites.yml
+++ b/jobs/ttcn3-testsuites.yml
@@ -40,15 +40,6 @@
           timer: 20 04 * * *
           description: |
             Test osmo-ggsn latest with the Debian kernel.
-      - ttcn3-ggsn-test-kernel-git:
-          blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*"
-          timer: 30 04 * * *
-          # Cache the linux source tree in the workspace of one node
-          node: ttcn3-ggsn-test-kernel-git
-          description: |
-            Test osmo-ggsn master with a kernel built from source (see build
-            parameters, by default: net-next.git from kernel.org).
-          wipe_workspace: false
       - ttcn3-msc-test:
           blocking: "^(ttcn3|TTCN3-.*)-msc-test.*"
           timer: 40 04 * * *
@@ -239,27 +230,6 @@
                 Branch of <code>docker-playground.git</code>.
                 Only modify if you are hacking on the docker-playground scripts.
           default: '*/master'
-      - string:
-          name: KERNEL_URL
-          description: |
-                (<code>*-kernel-git</code> only) remote URL of git repository,
-                from which the kernel will be built.
-          default: 'https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git'
-      - string:
-          name: KERNEL_REMOTE_NAME
-          description: |
-                (<code>*-kernel-git</code> only) short name for the remote URL,
-                which will be used to add it to the local git checkout with
-                <code>git remote add</code>.
-          default: 'net-next'
-      - string:
-          name: KERNEL_BRANCH
-          description: |
-                (<code>*-kernel-git</code> only) branch to check out from the
-                remote with <code>KERNEL_URL</code> and
-                <code>KERNEL_REMOTE_NAME</code> before building the kernel.
-          default: 'master'
-
     builders:
       - shell: |-
           export REGISTRY_HOST="registry.osmocom.org"
@@ -278,14 +248,6 @@
                   export IMAGE_SUFFIX="latest"
                   export KERNEL_TEST=1
                   ;;
-              ttcn3-ggsn-test-kernel-git)
-                  DIR="ttcn3-ggsn-test"
-                  export IMAGE_SUFFIX="master"
-                  # Build kernel from source, git repo is defined in the job's
-                  # parameters: KERNEL_URL, KERNEL_REMOTE_NAME, KERNEL_BRANCH
-                  export KERNEL_TEST=1
-                  export KERNEL_BUILD=1
-                  ;;
               TTCN3-centos-*-latest)
                   DIR="$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/ | sed s/\-latest$//)"
                   export IMAGE_SUFFIX="latest-centos8"

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23194
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Iafbe6139db47c2918dc1fd7c3bacf38da326d9c8
Gerrit-Change-Number: 23194
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210302/128eee78/attachment.htm>


More information about the gerrit-log mailing list