diff options
| -rw-r--r-- | jjb/doc/doc.yaml | 2 | ||||
| -rw-r--r-- | jjb/optf/build-optf-fgps-docker-image.sh | 3 | ||||
| -rw-r--r-- | jjb/policy/policy-api.yaml | 63 | ||||
| -rw-r--r-- | jjb/so/so-libs.yaml | 3 | ||||
| -rw-r--r-- | jjb/so/so.yaml | 33 |
5 files changed, 42 insertions, 62 deletions
diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index 5ae9f730b..9ab7df977 100644 --- a/jjb/doc/doc.yaml +++ b/jjb/doc/doc.yaml @@ -27,6 +27,8 @@ branch: 'casablanca' - dublin: branch: 'dublin' + - elalto: + branch: 'elalto' - project: name: doc-info diff --git a/jjb/optf/build-optf-fgps-docker-image.sh b/jjb/optf/build-optf-fgps-docker-image.sh index 2d7b4f62d..af731580d 100644 --- a/jjb/optf/build-optf-fgps-docker-image.sh +++ b/jjb/optf/build-optf-fgps-docker-image.sh @@ -8,3 +8,6 @@ echo $CURRENTDIR chmod 755 ./*.* cd ./valetapi ./build-dockers.sh + +cd ../engine +./build-dockers.sh diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 8a13714ed..ea20cea04 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -1,6 +1,6 @@ --- - project: - name: policy-api-elalto + name: policy-api project-name: 'policy-api' jobs: - '{project-name}-{stream}-verify-java' @@ -23,67 +23,10 @@ project: 'policy/api' stream: - - 'elalto': - branch: 'elalto' - mvn-settings: 'policy-api-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - -- project: - name: policy-api - project-name: 'policy-api' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - project-name: 'policy-api-amd64' - docker-pom: 'pom.xml' - mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' - build-node: ubuntu1604-docker-8c-8g - pattern: 'do_not_match_any_file' - - '{project-name}-{stream}-merge-java': - project-name: 'policy-api-arm64' - docker-pom: 'pom.xml' - mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' - build-node: ubuntu1604-docker-arm64-4c-2g - pattern: 'do_not_match_any_file' - - '{project-name}-multiarch-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - project-name: 'policy-api-amd64' - build-node: ubuntu1604-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' - container-public-registry: 'docker.io' - container-staging-registry: 'docker.io' - cron: '' - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'do_not_match_any_file' - - gerrit-maven-docker-stage: - project-name: 'policy-api-arm64' - build-node: ubuntu1604-docker-arm64-4c-2g - maven-versions-plugin: true - mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' - container-public-registry: 'docker.io' - container-staging-registry: 'docker.io' - cron: '' - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'do_not_match_any_file' - - '{project-name}-docker-manifest-{stream}': - build-node: ubuntu1604-docker-8c-8g - - '{project-name}-multiarch-docker-stage-{stream}' -# - '{project-name}-gerrit-release-jobs': -# build-node: centos7-docker-8c-8g - - project: 'policy/api' - stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'policy-api-settings' files: '**' archive-artifacts: '' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 977d397fe..8ad44cb8d 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'so-libs-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -54,3 +56,4 @@ - gerrit-info-yaml-verify project: so/libs branch: master + branch: elalto diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 21e9c643e..d36fdd859 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -27,6 +27,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' mvn-settings: 'so-settings' files: '**' archive-artifacts: '' @@ -46,6 +48,34 @@ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: + name: 'so-coverity' + jobs: + - 'onap-gerrit-maven-coverity' + cron: '@daily' + build-node: 'ubuntu1604-builder-4c-4g' + project: 'so' + project-name: 'so' + branch: 'master' + mvn-settings: 'so-settings' + mvn-params: '-Dmaven.test.skip=true' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + coverity-project-name: 'onap-so' + coverity-token: 'SrGGJp9T1n1lhJn2sF72XQ' + coverity-user-email: 'A.Naluzhnyy@samsung.com' + coverity-search-paths: > + so-monitoring/so-monitoring-ui/src/main/frontend/src + coverity-search-exclude-regexs: > + /cov-int/ + /cov-analysis- + ^/usr/ + ^/home/ + /node_modules/ + /bower_components/ + /bower_components_external/ + /src/test/ + /__test__/ + +- project: name: so-clm jobs: - gerrit-maven-clm @@ -56,8 +86,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' mvn-settings: 'so-settings' - project: @@ -67,3 +95,4 @@ - gerrit-info-yaml-verify project: so branch: master + branch: elalto |