From: Jamo Luhrsen <jluhrsen@redhat.com>
Date: Fri, 24 Aug 2018 15:48:09 +0000 (+0000)
Subject: Merge changes from topic '75395'
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=6b5762b6108aa24113219ac431182ec771fb18a6;hp=5bc7aa9ee2bee2fb183c55d275186c0c99805d66;p=releng%2Fbuilder.git

Merge changes from topic '75395'

* changes:
  Ensure autorelease pull submodule HEAD of branch
  Update CentOS 7 builder to pick up new git version
---

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
deleted file mode 100644
index 3a328e418..000000000
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-- project:
-    name: topoprocessing-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'topoprocessing'
-    project-name: 'topoprocessing'
-    branch: 'master'
-    mvn-settings: 'topoprocessing-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a691bbe2328cb
-
-- project:
-    name: topoprocessing-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'topoprocessing'
-    project-name: 'topoprocessing'
-    branch: 'stable/fluorine'
-    mvn-settings: 'topoprocessing-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a691bbe2328cb
-
-- project:
-    name: topoprocessing-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'topoprocessing'
-    project-name: 'topoprocessing'
-    branch: 'stable/oxygen'
-    mvn-settings: 'topoprocessing-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a691bbe2328cb
-
-- project:
-    name: topoprocessing-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'topoprocessing'
-    project-name: 'topoprocessing'
-    branch: 'master'
-    mvn-settings: 'topoprocessing-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- view:
-    name: topoprocessing
-    description: 'List of topoprocessing jobs'
-    regex: '^topoprocessing-.*'
-    <<: *releng_view_common