Merge "Revert "Automation adds integration-simulators-nf-simulator-avcn-manager.yaml""
diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index d33a25a..9585cfa 100644
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -24,10 +24,8 @@
jobs:
- '{project-name}-review-verification-maven-{stream}':
mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
- maven-versions-plugin: true
- '{project-name}-merge-verification-maven-{stream}':
mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
- maven-versions-plugin: true
project-name: 'ccsdk-oran'
recipients: 'bjorn.magnusson@est.tech martin.c.yan@est.tech'
# project name in gerrit
@@ -39,4 +37,4 @@
branch: 'guilin'
mvn-settings: 'ccsdk-oran-settings'
robot-options: ''
- branch: 'master'
\ No newline at end of file
+ branch: 'master'
diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml
new file mode 100644
index 0000000..4328a27
--- /dev/null
+++ b/jjb/cps/cps-csit.yaml
@@ -0,0 +1,20 @@
+---
+- project:
+ name: cps-csit
+ jobs:
+ - '{project-name}-review-verification-maven-{stream}':
+ mvn-goals: clean install
+ mvn-params: '-Dmaven.test.skip=true -Dnexus.repository= -Pcps-xnf-docker'
+ - '{project-name}-merge-verification-maven-{stream}':
+ mvn-goals: clean install
+ mvn-params: '-Dmaven.test.skip=true -Dnexus.repository= -Pcps-xnf-docker'
+ project-name: 'cps'
+ recipients: 'toine.siebelink@est.tech'
+ # project name in gerrit
+ project: 'cps'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'cps-settings'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index a78dcd6..f21b5ab 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@ -16,6 +16,8 @@
jobs:
- '{project-name}-python-jobs'
- '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
archive-artifacts: ''
container-tag-method: latest
nexus-iq-namespace: 'onap-'
diff --git a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
new file mode 100644
index 0000000..00f73de
--- /dev/null
+++ b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
@@ -0,0 +1,66 @@
+---
+- project:
+ name: integration-simulators-nf-simulator-pm-https-server
+ project-name: 'integration-simulators-nf-simulator-pm-https-server'
+ java-version: openjdk11
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-docker-8c-8g
+ maven-versions-plugin: true
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+ mvn-goals: 'clean package docker:build docker:push'
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
+
+ project: 'integration/simulators/nf-simulator/pm-https-server'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'integration-simulators-nf-simulator-pm-https-server-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 in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: '**'
+ archive-artifacts: ''
+ build-node: 'ubuntu1804-docker-8c-8g'
+
+- project:
+ name: integration-simulators-nf-simulator-pm-https-server-sonar
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-sonar
+ 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: ubuntu1804-docker-8c-8g
+ project: 'integration/simulators/nf-simulator/pm-https-server'
+ project-name: 'integration-simulators-nf-simulator-pm-https-server'
+ branch: 'master'
+ mvn-settings: 'integration-simulators-nf-simulator-pm-https-server-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: integration-simulators-nf-simulator-pm-https-server-view
+ project-name: integration-simulators-nf-simulator-pm-https-server
+ views:
+ - project-view
+
+- project:
+ name: integration-simulators-nf-simulator-pm-https-server-info
+ project: integration/simulators/nf-simulator/pm-https-server
+ project-name: integration-simulators-nf-simulator-pm-https-server
+ build-node: centos7-builder-2c-1g
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/multicloud/build-multicloud-azure-docker-image.sh b/jjb/multicloud/build-multicloud-azure-docker-image.sh
deleted file mode 100755
index e4e6d8d..0000000
--- a/jjb/multicloud/build-multicloud-azure-docker-image.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
-
-CURRENTDIR="$(pwd)"
-echo $CURRENTDIR
-
-chmod 755 ./azure/docker/*.*
-
-./azure/docker/build_image.sh
-
diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
deleted file mode 100644
index d610663..0000000
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
----
-- project:
- name: multicloud-azure-java
- project-name: 'multicloud-azure'
- project: 'multicloud/azure'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'multicloud-azure-settings'
- subproject:
- - 'azure':
- pom: 'azure/pom.xml'
- pattern: 'azure/**'
- jobs:
-# - '{project-name}-{stream}-verify-java'
-# - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- - gerrit-maven-docker-stage:
- build-node: ubuntu1804-docker-8c-8g
- maven-goals: install
- mvn-params: '-P docker'
- maven-versions-plugin: true
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-builder-4c-4g
-
-#- project:
-# name: multicloud-azure-arm64-java
-# project-name: 'multicloud-azure-arm64'
-# project: 'multicloud/azure'
-# stream:
-# - 'master':
-# branch: 'master'
-# mvn-settings: 'multicloud-azure-settings'
-# subproject:
-# - 'azure':
-# pom: 'azure/pom.xml'
-# pattern: 'azure/**'
-# jobs:
-# - '{project-name}-{stream}-docker-java-version-shell-daily':
-# docker-pom: 'pom.xml'
-# mvn-goals: 'install'
-# script:
-# !include-raw-escape: 'build-multicloud-azure-docker-image.sh'
-# files: '**'
-# archive-artifacts: ''
-# build-node: ubuntu1804-docker-arm64-4c-2g
-#
-- project:
- name: multicloud-azure-sonar
- jobs:
- - gerrit-maven-sonar
- 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: ubuntu1804-builder-4c-4g
- project: 'multicloud/azure'
- project-name: 'multicloud-azure'
- branch: 'master'
- mvn-settings: 'multicloud-azure-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
- name: multicloud-azure-java-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: multicloud/azure
- project-name: 'multicloud-azure'
- branch: 'master'
- mvn-settings: 'multicloud-azure-settings'
-
-- project:
- name: multicloud-azure-info
- project-name: multicloud-azure
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: multicloud/azure
- branch: master
diff --git a/jjb/multicloud/multicloud-azure-python.yaml b/jjb/multicloud/multicloud-azure-python.yaml
deleted file mode 100644
index 8aec29b..0000000
--- a/jjb/multicloud/multicloud-azure-python.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
- name: multicloud-azure-python
- project-name: 'multicloud-azure'
- project: 'multicloud/azure'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'multicloud-azure-settings'
- build-node: 'ubuntu1804-builder-4c-4g'
- subproject:
- - 'azure':
- path: 'azure'
- pattern: 'azure/**'
- jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'