Merge "Reduce maximal size of karaf.log to fit in new VMs"

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
new file mode 100644 (file)
index 0000000..d137efc
--- /dev/null
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -0,0 +1,39 @@
+- project:
+    name: genius-csit-genius
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
+
+    # The project name
+    project: 'genius'
+
+    # The functionality under test
+    functionality: 'genius'
+
+    # Project branches
+    stream:
+        - carbon:
+            branch: 'master'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Mininet configuration
+    mininet-image: 'ubuntu-trusty-mininet-ovs-23-2c-2g'
+    mininet-vms: 2
+
+    # Features to install
+    install-features: 'odl-genius-ui'
+
+    # Robot custom options
+    robot-options: ' '
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},genius-distribution-{stream}'

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 89a9ebc3a6dd9d625ce6788cd403754e52e8d476..d385251772271ed8fd1b7811ea8505bb4cfeb6fb 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -58,11 +58,11 @@
                       pattern: jjb-templates/**
 
     builders:
-        - opendaylight-infra-pre-builders
         - shell: |
             pip freeze
             jenkins-jobs -l DEBUG test --recursive -o archives/job_output jjb/
             gzip archives/job_output/*
+
         - releng-check-unicode
 
     publishers:
@@ -122,7 +122,6 @@
 
 
     builders:
-        - opendaylight-infra-pre-builders
         - shell: |
             virtualenv $WORKSPACE/venv
             source $WORKSPACE/venv/bin/activate
@@ -189,7 +188,6 @@
                       pattern: jjb-templates/**
 
     builders:
-        - opendaylight-infra-pre-builders
         - shell: |
             pip freeze
             jenkins-jobs --version
@@ -238,7 +236,6 @@
         - timed: 'H H * * 0'
 
     builders:
-        - opendaylight-infra-pre-builders
         - shell: |
             jenkins-jobs --flush-cache update --recursive jjb/
 
@@ -275,7 +272,6 @@
         - timed: 'H H * * 1'
 
     builders:
-        - opendaylight-infra-pre-builders
         - shell:
             !include-raw-escape:
                 - include-raw-check-poms.sh

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 2f3a79e3e59e8c0cfb0777864a1b21f774a9090f..820abd08440e79a8a00951e98fac869c4e35ffb8 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -290,19 +290,6 @@
         - workspace-cleanup:
             fail-build: false
 
-- builder:
-    name: opendaylight-infra-pre-builders
-    builders:
-        - shell: |
-            if [ ! -z "$GERRIT_PATCHSET_REVISION" ]; then
-                LOG_MESSAGE="
-                    Logs for $JOB_NAME:
-                    https://logs.opendaylight.org/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER
-                    (note that logs will be unavailable until the job is completed running.)
-                "
-                ssh -p 29418 jenkins-$SILO@git.opendaylight.org gerrit review -m \"${LOG_MESSAGE}\" $GERRIT_PATCHSET_REVISION
-            fi
-
 - builder:
     name: wipe-org-opendaylight-repo
     builders: