summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------global-jjb0
-rw-r--r--jjb/cicn/cicn.yaml4
-rw-r--r--jjb/csit/csit.yaml4
-rw-r--r--jjb/dmm/dmm.yaml4
-rw-r--r--jjb/hc2vpp/hc2vpp.yaml4
-rw-r--r--jjb/hicn/hicn.yaml4
-rw-r--r--jjb/honeycomb/honeycomb.yaml4
-rw-r--r--jjb/sweetcomb/sweetcomb.yaml4
-rw-r--r--jjb/tldk/tldk.yaml16
-rw-r--r--jjb/udpi/udpi.yaml8
-rw-r--r--jjb/vpp/vpp.yaml2
-rw-r--r--jjb/vsap/vsap.yaml45
12 files changed, 70 insertions, 29 deletions
diff --git a/global-jjb b/global-jjb
-Subproject 279b573811bf9bf82e55ae62ca95a2519cc5c78
+Subproject 39abe0daab310c07b85f834d81f07c82218ef50
diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml
index 5c1448e5..07a4ac3e 100644
--- a/jjb/cicn/cicn.yaml
+++ b/jjb/cicn/cicn.yaml
@@ -613,7 +613,7 @@
project-name: cicn
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-4c-4g
+ build-node: centos7-builder-2c-2g
project: cicn
branch: master
@@ -627,6 +627,6 @@
sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
branch: master
- build-node: centos7-builder-4c-4g
+ build-node: centos7-builder-2c-2g
jobs:
- gerrit-maven-sonar
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 62be2a75..8a15bf22 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -298,7 +298,7 @@
project-name: csit
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-4c-4g
+ build-node: centos7-builder-2c-2g
project: csit
branch: master
@@ -312,6 +312,6 @@
sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
branch: master
- build-node: centos7-builder-4c-4g
+ build-node: centos7-builder-2c-2g
jobs:
- gerrit-maven-sonar
diff --git a/jjb/dmm/dmm.yaml b/jjb/dmm/dmm.yaml
index 800441d6..fc916d65 100644
--- a/jjb/dmm/dmm.yaml
+++ b/jjb/dmm/dmm.yaml
@@ -234,7 +234,7 @@
project-name: dmm
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-4c-4g
+ build-node: centos7-builder-2c-2g
project: dmm
branch: master
@@ -248,6 +248,6 @@
sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
branch: master
- build-node: centos7-docker-4c-4g
+ build-node: centos7-docker-2c-2g
jobs:
- gerrit-maven-sonar
diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index 661b75f3..f030cfe6 100644
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -267,7 +267,7 @@
project-name: hc2vpp
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-4c-4g
+ build-node: centos7-builder-2c-2g
project: hc2vpp
branch: master
@@ -281,6 +281,6 @@
sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
branch: master
- build-node: centos7-docker-4c-4g
+ build-node: centos7-docker-2c-2g
jobs:
- gerrit-maven-sonar
diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml
index 4f0d69f8..055ee860 100644
--- a/jjb/hicn/hicn.yaml
+++ b/jjb/hicn/hicn.yaml
@@ -544,7 +544,7 @@
sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
branch: master
- build-node: centos7-docker-4c-4g
+ build-node: centos7-docker-2c-2g
jobs:
- gerrit-maven-sonar
@@ -868,6 +868,6 @@
project-name: hicn
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-4c-4g
+ build-node: centos7-builder-2c-2g
project: hicn
branch: master
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 8642323b..e088d547 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -286,7 +286,7 @@
project-name: honeycomb
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-4c-4g
+ build-node: centos7-builder-2c-2g
project: honeycomb
branch: master
@@ -300,6 +300,6 @@
sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
branch: master
- build-node: centos7-docker-4c-4g
+ build-node: centos7-docker-2c-2g
jobs:
- gerrit-maven-sonar
diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml
index fa601d8b..24761b29 100644
--- a/jjb/sweetcomb/sweetcomb.yaml
+++ b/jjb/sweetcomb/sweetcomb.yaml
@@ -254,7 +254,7 @@
project-name: sweetcomb
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-4c-4g
+ build-node: centos7-builder-2c-2g
project: sweetcomb
branch: master
@@ -268,6 +268,6 @@
sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
branch: master
- build-node: centos7-docker-4c-4g
+ build-node: centos7-docker-2c-2g
jobs:
- gerrit-maven-sonar
diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index 4fd10a09..1cf86135 100644
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -80,8 +80,7 @@
!include-raw-escape: include-raw-build.sh
publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn36'
+ - lf-infra-publish
- job-template:
name: '{project}-verify-image-{stream}-{os}'
@@ -141,8 +140,7 @@
!include-raw-escape: include-raw-build.sh
publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn36'
+ - lf-infra-publish
- job-template:
name: '{project}-merge-{stream}-{os}'
@@ -187,8 +185,7 @@
!include-raw-escape: include-raw-build.sh
publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn36'
+ - lf-infra-publish
- job-template:
name: 'tldk-csit-verify-func-{stream}-{os}-virl'
@@ -241,15 +238,14 @@
publishers:
- robot-report:
output-path: ''
- - fdio-infra-shiplogs:
- maven-version: 'mvn36'
+ - lf-infra-publish
- project:
name: tldk-info
project-name: tldk
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-4c-4g
+ build-node: centos7-builder-2c-2g
project: tldk
branch: master
@@ -263,6 +259,6 @@
sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
branch: master
- build-node: centos7-docker-4c-4g
+ build-node: centos7-docker-2c-2g
jobs:
- gerrit-maven-sonar
diff --git a/jjb/udpi/udpi.yaml b/jjb/udpi/udpi.yaml
index a3e2d3a0..fa2b7eee 100644
--- a/jjb/udpi/udpi.yaml
+++ b/jjb/udpi/udpi.yaml
@@ -105,7 +105,7 @@
publishers:
- fdio-infra-shiplogs:
- maven-version: 'mvn36'
+ maven-version: 'mvn36'
- naginator:
rerun-unstable-builds: false
max-failed-builds: 1
@@ -174,7 +174,7 @@
publishers:
- fdio-infra-shiplogs:
- maven-version: 'mvn36'
+ maven-version: 'mvn36'
- naginator:
rerun-unstable-builds: false
max-failed-builds: 1
@@ -185,7 +185,7 @@
project-name: udpi
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-4c-4g
+ build-node: centos7-builder-2c-2g
project: udpi
branch: master
@@ -199,6 +199,6 @@
sonarcloud-api-token: '{sonarcloud_api_token}'
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
branch: master
- build-node: centos7-docker-4c-4g
+ build-node: centos7-docker-2c-2g
jobs:
- gerrit-maven-sonar
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 092c3c20..e1f2074e 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -201,7 +201,7 @@
project-name: vpp
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-4c-4g
+ build-node: centos7-builder-2c-2g
project: vpp
branch: master
diff --git a/jjb/vsap/vsap.yaml b/jjb/vsap/vsap.yaml
new file mode 100644
index 00000000..43b60198
--- /dev/null
+++ b/jjb/vsap/vsap.yaml
@@ -0,0 +1,45 @@
+---
+#########################################################################
+#
+# Copyright (c) 2019 Intel and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#########################################################################
+
+- project:
+ name: vsap-view
+ views:
+ - project-view
+ project-name: vsap
+
+- project:
+ name: vsap-info
+ project-name: vsap
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-2g
+ project: vsap
+ branch: master
+
+- project:
+ name: vsap-sonar
+ project: vsap
+ project-name: vsap
+ mvn-settings: vsap-settings
+ sonarcloud: true
+ sonarcloud-project-organization: '{sonarcloud_project_organization}'
+ sonarcloud-api-token: '{sonarcloud_api_token}'
+ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ branch: master
+ build-node: centos7-docker-4c-4g
+ jobs:
+ - gerrit-maven-sonar