Merge "Adding docker goals to tca-gen2-"
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index c119710..56b9925 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -14,6 +14,7 @@
- 'beijing':
branch: 'beijing'
mvn-settings: 'aai-aai-common-settings'
+ mvn-version: 'mvn35'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
@@ -30,3 +31,4 @@
mvn-settings: 'aai-aai-common-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml
index bc3b073..2df4345 100644
--- a/jjb/aai/aai-cacher.yaml
+++ b/jjb/aai/aai-cacher.yaml
@@ -16,6 +16,7 @@
- 'master':
branch: 'master'
mvn-settings: 'aai-cacher-settings'
+ mvn-version: 'mvn35'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
@@ -32,3 +33,4 @@
mvn-settings: 'aai-cacher-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml
new file mode 100644
index 0000000..cda1885
--- /dev/null
+++ b/jjb/aai/aai-gallifrey.yaml
@@ -0,0 +1,20 @@
+---
+- project:
+ name: aai-gallifrey
+ project-name: 'aai-gallifrey'
+ jobs:
+ - gerrit-maven-clm
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-aai-docker-java-daily':
+ pom: 'pom.xml'
+ mvn-goals: 'clean package dockerfile:build dockerfile:push'
+ build-node: 'ubuntu1604-docker-8c-8g'
+ project: 'aai/gallifrey'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-gallifrey-settings'
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index a3ff36b..25366b7 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -16,6 +16,7 @@
- 'master':
branch: 'master'
mvn-settings: 'aai-graphadmin-settings'
+ mvn-version: 'mvn35'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
@@ -32,3 +33,4 @@
mvn-settings: 'aai-graphadmin-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 4d6448a..e88c0f9 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -18,6 +18,7 @@
- 'beijing':
branch: 'beijing'
mvn-settings: 'aai-resources-settings'
+ mvn-version: 'mvn35'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
@@ -34,3 +35,4 @@
mvn-settings: 'aai-resources-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 6c4eec0..830ff43 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -18,6 +18,7 @@
- 'beijing':
branch: 'beijing'
mvn-settings: 'aai-traversal-settings'
+ mvn-version: 'mvn35'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
@@ -34,3 +35,4 @@
mvn-settings: 'aai-traversal-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-version: 'mvn35'
diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml
deleted file mode 100644
index 73c0bee..0000000
--- a/jjb/ccsdk/storage-pgaas.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-- project:
- name: ccsdk-storage-pgaas
- project-name: 'ccsdk-storage-pgaas'
- jobs:
- - gerrit-maven-clm
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
-
- project: 'ccsdk/storage/pgaas'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'ccsdk-storage-pgaas-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: ''
-
-- project:
- name: ccsdk-storage-pgaas-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-builder-4c-4g
- project: 'ccsdk/storage/pgaas'
- project-name: 'ccsdk-storage-pgaas'
- branch: 'master'
- mvn-settings: 'ccsdk-storage-pgaas-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
index 7ea128c..4a02979 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml
@@ -27,7 +27,7 @@
jobs:
- gerrit-maven-sonar
cron: 'H 11 * * *'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1604-docker-8c-8g
project: 'dcaegen2/collectors/datafile'
project-name: 'dcaegen2-collectors-datafile'
branch: 'master'
diff --git a/jjb/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml
new file mode 100644
index 0000000..1ba6d5d
--- /dev/null
+++ b/jjb/dmaap/dmaap-buscontroller-csit.yaml
@@ -0,0 +1,20 @@
+---
+- project:
+ name: dmaap-buscontroller-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'dmaap-buscontroller'
+ stream: 'master'
+ functionality:
+ - 'ssl':
+ trigger_jobs:
+ - '{project-name}-{stream}-release-java-daily-checkstyle'
+ - 'with_mr':
+ trigger_jobs:
+ - '{project-name}-{stream}-release-java-daily-checkstyle'
+ - 'with_dr':
+ trigger_jobs:
+ - '{project-name}-{stream}-release-java-daily-checkstyle'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/dmaap/dmaap-kafka.yaml b/jjb/dmaap/dmaap-kafka.yaml
new file mode 100644
index 0000000..0a15b18
--- /dev/null
+++ b/jjb/dmaap/dmaap-kafka.yaml
@@ -0,0 +1,25 @@
+---
+- project:
+ name: dmaap-kafka
+ project-name: 'dmaap-kafka'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ project: 'dmaap/kafka11aaf'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'dmaap-kafka11aaf-settings'
+
+- project:
+ name: dmaap-kafka-sonar
+ jobs:
+ - gerrit-maven-sonar
+ cron: 'H 11 * * *'
+ build-node: ubuntu1604-builder-4c-4g
+ project: 'dmaap/kafka11aaf'
+ project-name: 'dmaap-kafka'
+ branch: 'master'
+ mvn-settings: 'dmaap-kafka11aaf-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/openci/create-ape.sh b/jjb/openci/create-ape.sh
index 3a4c8af..5bd3a06 100755
--- a/jjb/openci/create-ape.sh
+++ b/jjb/openci/create-ape.sh
@@ -11,19 +11,37 @@
set -o nounset
set -o pipefail
-# This script creates ArtifactPublishedEvent (APE)
-# The JMS Messaging Plugin doesn't handle the newlines well so the eventBody is
-# constructed on a single line. This is something that needs to be fixed properly
+# workaround for https://github.com/pypa/virtualenv/issues/1029
+export PS1=${PS1:-}
-cat << EOF > $WORKSPACE/event.properties
-type=$PUBLISH_EVENT_TYPE
-origin=$PUBLISH_EVENT_ORIGIN
-eventBody="{ 'type': '$PUBLISH_EVENT_TYPE', 'id': '$(uuidgen)', \
-'time': '$(date -u +%Y-%m-%d_%H:%M:%SUTC)', 'origin': '$PUBLISH_EVENT_ORIGIN', \
-'buildUrl': '$BUILD_URL', 'branch': 'master', 'artifactLocation': '$ARTIFACT_LOCATION', \
-'confidenceLevel': { $CONFIDENCE_LEVEL } }"
+# This script creates ArtifactPublishedEvent (APE)
+
+git clone https://gitlab.openci.io/openci/prototypes.git
+cd prototypes/federated-cicd
+virtualenv openci_publish
+cd openci_publish
+source bin/activate
+python setup.py install
+
+# generate event body
+cat <<EOF > ./json_body.txt
+{
+ "type": "$PUBLISH_EVENT_TYPE",
+ "id": "$(uuidgen)",
+ "time": "$(date -u +%Y-%m-%d_%H:%M:%SUTC)",
+ "buildUrl": "$BUILD_URL",
+ "branch": "master",
+ "origin": "$PUBLISH_EVENT_ORIGIN",
+ "artifactLocation": "$ARTIFACT_LOCATION",
+ "confidenceLevel": "$CONFIDENCE_LEVEL"
+}
EOF
+
echo "Constructed $PUBLISH_EVENT_TYPE"
echo "--------------------------------------------"
-cat $WORKSPACE/event.properties
+cat ./json_body.txt
echo "--------------------------------------------"
+
+python openci_publish -H 129.192.69.55 -U ${ACTIVEMQ_USER} -p ${ACTIVEMQ_PASSWORD} -n openci.prototype -B ./json_body.txt
+
+deactivate
diff --git a/jjb/openci/openci-onap-daily-jobs.yaml b/jjb/openci/openci-onap-daily-jobs.yaml
index d328e25..bf6afde 100644
--- a/jjb/openci/openci-onap-daily-jobs.yaml
+++ b/jjb/openci/openci-onap-daily-jobs.yaml
@@ -46,24 +46,10 @@
description: 'The confidence level the published artifact gained'
builders:
- # first build step in the job executes create-ape.sh to construct the
- # ArtifactPublishedEvent (ape)
+ # this build step in the job executes create-ape.sh to construct the
+ # ArtifactPublishedEvent (ape) and publish it using the python utility
- shell:
!include-raw-escape: ./create-ape.sh
- # constructed event gets injected into environment so JME Messaging
- # plugin can publish the event and its properties in post-build step
- - inject:
- properties-file: "$WORKSPACE/event.properties"
-
- publishers:
- - jms-messaging:
- provider-name: openci.activemq
- msg-type: Custom
- msg-props: |
- type=$type
- origin=$origin
- msg-content:
- $eventBody
# This job gets triggered by a ConfidenceLevelModifiedEvent published
# by OPNFV jobs so ONAP can promote the autorelease artifact even further.
@@ -82,14 +68,7 @@
triggers:
- jms-messaging:
provider-name: openci.activemq
- selector: CI_TYPE = 'custom'
- checks:
- - field: origin
- expected-value: 'OPNFV'
- - field: type
- expected-value: 'ConfidenceLevelModifiedEvent'
- - field: scenario
- expected-value: 'k8-nosdn-onap'
+ selector: JMSType = 'ConfidenceLevelModifiedEvent' and JMSOrigin = 'OPNFV' and JMSScenario = 'k8-nosdn-onap-ha'
builders:
- shell: |
diff --git a/jjb/sdnc/sdnc-features.yaml b/jjb/sdnc/sdnc-features.yaml
deleted file mode 100644
index 12accbb..0000000
--- a/jjb/sdnc/sdnc-features.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-- project:
- name: sdnc-features
- project-name: 'sdnc-features'
- jobs:
- - gerrit-maven-clm
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
-
- project: 'sdnc/features'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdnc-features-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: ubuntu1604-builder-4c-4g
-
-- project:
- name: sdnc-features-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-builder-4c-4g
- project: 'sdnc/features'
- project-name: 'sdnc-features'
- branch: 'master'
- mvn-settings: 'sdnc-features-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml
deleted file mode 100644
index 551b79d..0000000
--- a/jjb/sdnc/sdnc-plugins.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-- project:
- name: sdnc-plugins
- project-name: 'sdnc-plugins'
- jobs:
- - gerrit-maven-clm
- - '{project-name}-{stream}-verify-java':
- mvn-params: '-DskipTests=true'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
-
- project: 'sdnc/plugins'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdnc-plugins-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: ''
diff --git a/jjb/vvp/vvp-gitlab.yaml b/jjb/vvp/vvp-gitlab.yaml
index 5a91e29..47c553e 100644
--- a/jjb/vvp/vvp-gitlab.yaml
+++ b/jjb/vvp/vvp-gitlab.yaml
@@ -19,16 +19,3 @@
mvn-params: '-Dmaven.test.skip=true'
docker-pom: 'pom.xml'
mvn-profile: 'default'
-
-- project:
- name: vvp-gitlab-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-docker-8c-8g
- project: 'vvp/gitlab'
- project-name: 'vvp-gitlab'
- branch: 'master'
- mvn-settings: 'vvp-gitlab-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml
index 6b19f83..8d46eba 100644
--- a/jjb/vvp/vvp-jenkins.yaml
+++ b/jjb/vvp/vvp-jenkins.yaml
@@ -19,16 +19,3 @@
mvn-params: '-Dmaven.test.skip=true'
docker-pom: 'pom.xml'
mvn-profile: 'default'
-
-- project:
- name: vvp-jenkins-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-docker-8c-8g
- project: 'vvp/jenkins'
- project-name: 'vvp-jenkins'
- branch: 'master'
- mvn-settings: 'vvp-jenkins-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vvp/vvp-portal.yaml b/jjb/vvp/vvp-portal.yaml
index da1b896..6a50154 100644
--- a/jjb/vvp/vvp-portal.yaml
+++ b/jjb/vvp/vvp-portal.yaml
@@ -19,16 +19,3 @@
mvn-params: '-Dmaven.test.skip=true'
docker-pom: 'pom.xml'
mvn-profile: 'default'
-
-- project:
- name: vvp-portal-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-docker-8c-8g
- project: 'vvp/portal'
- project-name: 'vvp-portal'
- branch: 'master'
- mvn-settings: 'vvp-portal-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vvp/vvp-postgresql.yaml b/jjb/vvp/vvp-postgresql.yaml
index 3f4dcfd..22b60ef 100644
--- a/jjb/vvp/vvp-postgresql.yaml
+++ b/jjb/vvp/vvp-postgresql.yaml
@@ -19,16 +19,3 @@
mvn-params: '-Dmaven.test.skip=true'
docker-pom: 'pom.xml'
mvn-profile: 'default'
-
-- project:
- name: vvp-postgresql-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-docker-8c-8g
- project: 'vvp/postgresql'
- project-name: 'vvp-postgresql'
- branch: 'master'
- mvn-settings: 'vvp-postgresql-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml
index 72cee62..8dd6cd9 100644
--- a/jjb/vvp/vvp-test-engine.yaml
+++ b/jjb/vvp/vvp-test-engine.yaml
@@ -19,16 +19,3 @@
mvn-params: '-Dmaven.test.skip=true'
docker-pom: 'pom.xml'
mvn-profile: 'default'
-
-- project:
- name: vvp-test-engine-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-docker-8c-8g
- project: 'vvp/test-engine'
- project-name: 'vvp-test-engine'
- branch: 'master'
- mvn-settings: 'vvp-test-engine-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'