Merge "Switch infrautils to being MRI"

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 64b4de6c93afed299847037716888904d4787cd9..4ebffb44781afad67fbf1c6f44ef8da52b54c54f 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -1,8 +1,7 @@
 ---
 - project:
-    name: infrautils-aluminium
+    name: infrautils-master
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - 'gerrit-release-merge':
           build-node: centos7-builder-2c-2g
       - '{project-name}-rtd-jobs':
@@ -14,7 +13,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: master
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 3e7c8f6a9357ad754c46374341dcf06b20e98bfc..36dd6ba9bf6374aed929e787b5d19133340397db 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -73,7 +73,6 @@
               bgpcep-maven-merge-{stream},
               daexim-maven-merge-{stream},
               genius-maven-merge-{stream},
-              infrautils-maven-merge-{stream},
               jsonrpc-maven-merge-{stream},
               lispflowmapping-maven-merge-{stream},
               netconf-maven-merge-{stream},