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 4a8af4c063519006f1b9367d453a800731286b53..b9746c3f564fc62bdde399542bcb44fc121981d6 100644 (file)
--- 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 2ae17b23ea1e92293a9360a95e61ecd785616151..3a7992846af14f19e8ed176f7373b5adc8eb2eeb 100644 (file)
--- 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},