From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 30 Jan 2021 18:07:53 +0000 (+0100)
Subject: Switch AAA to being MRI
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=e394d47cf0a8e52328d4d23ae2f3b386dd75a662;p=releng%2Fbuilder.git

Switch AAA to being MRI

AAA is now a MRI project:
- use 'master' instead of 'silicon' to keep job continuity
- remove infrautils-distribution-check-aluminium
- do not trigger distribution-merge in aluminium

Change-Id: I73188c26d4dcc62807d38eb945ddd38a1669ba32
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 4a8af4c06..b9746c3f5 100644
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,8 +1,7 @@
 ---
 - project:
-    name: aaa-silicon
+    name: aaa-master
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: aaa
@@ -11,7 +10,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: master
     project: "aaa"
     project-name: "aaa"
     branch: "master"
diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 2ae17b23e..3a7992846 100644
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -63,7 +63,6 @@
           java-version: "openjdk11"
           jre: "openjdk11"
           dependencies: >
-            aaa-maven-merge-{stream},
             bgpcep-maven-merge-{stream},
             daexim-maven-merge-{stream},
             genius-maven-merge-{stream},