Merge "JJB for aaf/certservice"
diff --git a/global-jjb b/global-jjb
index 1fb55e8..f098976 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 1fb55e807d49e36b27d94d0c411c6907d2216068
+Subproject commit f09897651a64bbfa1d3424ca58d09cbb2af382cf
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 1a0e106..8db8e3e 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -10,6 +10,9 @@
build-node: centos7-builder-4c-4g
sign-artifacts: true
cron: ''
+ - '{project-name}-maven-javadoc-jobs':
+ mvn-site-id: ecomp-site
+ javadoc-path: org.onap.$PROJECT/$STREAM
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 088a9e0..f4996b9 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -10,6 +10,9 @@
build-node: centos7-builder-4c-4g
sign-artifacts: true
cron: ''
+ - '{project-name}-maven-javadoc-jobs':
+ mvn-site-id: ecomp-site
+ javadoc-path: org.onap.$PROJECT/$STREAM
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 7e296da..ebe19d4 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -9,6 +9,9 @@
- gerrit-maven-stage:
build-node: centos7-builder-4c-4g
cron: ''
+ - '{project-name}-maven-javadoc-jobs':
+ mvn-site-id: ecomp-site
+ javadoc-path: org.onap.$PROJECT/$STREAM
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index c955edd..c631f64 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -10,6 +10,9 @@
build-node: centos7-builder-4c-4g
sign-artifacts: true
cron: ''
+ - '{project-name}-maven-javadoc-jobs':
+ mvn-site-id: ecomp-site
+ javadoc-path: org.onap.$PROJECT/$STREAM
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index 79a39f6..dae2418 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -31,8 +31,8 @@
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
mvn-settings: 'clamp-settings'
java-version: openjdk11
files: '**'
diff --git a/jjb/clamp/dashboard/clamp-dashboard.yaml b/jjb/clamp/dashboard/clamp-dashboard.yaml
new file mode 100644
index 0000000..2cea7f5
--- /dev/null
+++ b/jjb/clamp/dashboard/clamp-dashboard.yaml
@@ -0,0 +1,72 @@
+---
+- project:
+ name: clamp-dashboard-project-view
+ project-name: clamp-dashboard
+ views:
+ - project-view
+
+- project:
+ name: clamp-dashboard
+ project-name: 'clamp-dashboard'
+ jobs:
+ - gerrit-maven-stage:
+ build-node: ubuntu1604-docker-8c-8g
+ maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1604-docker-8c-8g
+ maven-versions-plugin: true
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+ mvn-params: '-Dmaven.test.skip=true -P docker'
+ - '{project-name}-{stream}-verify-java-checkstyle':
+ mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+ - '{project-name}-{stream}-merge-properties-java':
+ mvn_properties:
+ - docker.pull.registry=nexus3.onap.org:10001
+ - docker.push.registry=nexus3.onap.org:10003
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
+
+ project: 'clamp/dashboard'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'clamp-settings'
+ java-version: openjdk11
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-docker-8c-8g
+
+#- project:
+# name: clamp-dashboard-sonar
+# jobs:
+# - gerrit-maven-sonar:
+# mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+# sonarcloud: true
+# sonarcloud-project-organization: '{sonarcloud_project_organization}'
+# sonarcloud-api-token: '{sonarcloud_api_token}'
+# sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+# sonar-mvn-goal: '{sonar_mvn_goal}'
+# cron: '@daily'
+# build-node: ubuntu1604-docker-8c-8g
+# project: 'clamp/dashboard'
+# project-name: 'clamp-dashboard'
+# branch: 'master'
+# mvn-settings: 'clamp-settings'
+# mvn-goals: 'clean install'
+# mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+# java-version: openjdk11
+#
+- project:
+ name: clamp-dashboard-clm
+ jobs:
+ - gerrit-maven-clm:
+ mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+ nexus-iq-namespace: 'onap-'
+ project: 'clamp/dashboard'
+ project-name: 'clamp-dashboard'
+ branch: 'master'
+ mvn-settings: 'clamp-settings'
+ build-node: ubuntu1604-docker-8c-8g
+ build-timeout: 120
+ java-version: openjdk11
diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 23eaae6..677e7e0 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -53,6 +53,19 @@
builders:
- shell: "${WORKSPACE}/autorelease/scripts/set-version.sh"
+- builder:
+ name: integration-install-vagrant
+ builders:
+ - shell: |
+ #!/bin/bash
+ set -ex # Fail build if any setup step fails
+ add-apt-repository --yes ppa:tiagohillebrandt/vagrant
+ apt update
+ apt --yes install libxslt-dev libxml2-dev libvirt-dev zlib1g-dev ruby-dev vagrant
+ vagrant plugin install vagrant-libvirt
+ vagrant plugin install vagrant-disksize
+ mkdir -p ~/.ssh
+
- publisher:
name: integration-robot
publishers:
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
new file mode 100644
index 0000000..5d07b31
--- /dev/null
+++ b/jjb/integration/integration-templates.yaml
@@ -0,0 +1,45 @@
+---
+- job-template:
+ # Job template for verifying Vagrantfiles
+ #
+ # The purpose of this job template is to run:
+ # vagrant validate
+
+ name: '{project-name}-{stream}-verify-vagrantfile'
+ project-type: freestyle
+ description: 'Job intended for validating vagrantfiles'
+ node: 'ubuntu1604-builder-2c-1g.cfg'
+
+ parameters:
+ - lf-infra-parameters:
+ project: '{project}'
+ stream: '{stream}'
+ branch: '{branch}'
+
+ properties:
+ - infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+ submodule-recursive: '{submodule-recursive}'
+
+ wrappers:
+ - infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ - gerrit-trigger-patch-submitted:
+ server: '{server-name}'
+ project: '{project}'
+ branch: '{branch}'
+ files: '**/Vagrantfile'
+
+ builders:
+ - integration-install-vagrant
+ - shell: !include-raw-escape: 'vagrantfile-verify.sh'
+
+ publishers:
+ - lf-infra-publish
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index de18753..31bda6e 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -13,3 +13,33 @@
build-node: centos7-builder-2c-1g
project: integration
branch: master
+
+- project:
+ name: integration-verify-python
+ project-name: integration
+ project: integration
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
+ mvn-settings: 'integration-settings'
+ build-node: 'centos7-builder-4c-4g'
+ subproject:
+ - 'test-vcpe':
+ path: 'test/vcpe'
+ pattern: 'test/vcpe/**'
+ jobs:
+ - '{project-name}-{stream}-{subproject}-verify-python'
+
+- project:
+ name: integration-verify-vagrantfile
+ project-name: 'integration'
+ project: 'integration'
+
+ stream:
+ - 'master':
+ branch: 'master'
+
+ jobs:
+ - '{project-name}-{stream}-verify-vagrantfile'
diff --git a/jjb/integration/vagrantfile-verify.sh b/jjb/integration/vagrantfile-verify.sh
new file mode 100644
index 0000000..6af0a9d
--- /dev/null
+++ b/jjb/integration/vagrantfile-verify.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Copyright 2020 Samsung Electronics Co., Ltd.
+#
+# 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.
+
+echo "---> vagrantfile-verify.sh"
+
+set -e
+
+declare -a CHANGED_VAGRANTFILES
+CMD='vagrant validate'
+
+CHANGED_VAGRANTFILES=(`git diff HEAD^ HEAD --name-only "*Vagrantfile"`)
+
+for v_dir in ${CHANGED_VAGRANTFILES[@]};
+do
+ echo "---> Validating ./$v_dir"
+ pushd $(dirname $v_dir)
+ eval "$CMD"
+ popd
+done
diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index edd2a33..29d9422 100644
--- a/jjb/oom/offline-installer.yaml
+++ b/jjb/oom/offline-installer.yaml
@@ -8,8 +8,8 @@
stream:
- 'master':
branch: 'master'
- - 'dublin':
- branch: 'dublin'
+ - 'elalto':
+ branch: 'elalto'
jobs:
- '{project-name}-{stream}-review':
diff --git a/jjb/rtdv3/rtdv3.yaml b/jjb/rtdv3/rtdv3.yaml
index 24b086a..017218a 100644
--- a/jjb/rtdv3/rtdv3.yaml
+++ b/jjb/rtdv3/rtdv3.yaml
@@ -15,6 +15,7 @@
name: rtdv3-global
default-version: latest
tox-dir: "docs/"
+ doc-dir: "_build/html"
build-node: centos7-builder-2c-1g
# override the default to ignore ref-updated-event (tag)
gerrit_merge_triggers:
diff --git a/jjb/testsuite/testsuite-oom.yaml b/jjb/testsuite/testsuite-oom.yaml
new file mode 100644
index 0000000..40b281a
--- /dev/null
+++ b/jjb/testsuite/testsuite-oom.yaml
@@ -0,0 +1,10 @@
+---
+- project:
+ name: testsuite-oom
+ project-name: testsuite-oom
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: testsuite/oom
+ branch: master
+