diff options
64 files changed, 326 insertions, 350 deletions
diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index f1e9570da..29d4cd3ea 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.yaml @@ -16,7 +16,7 @@ archive-artifacts: '' - project: - name: aaf-cadi-sonar + name: aaf-cadi-shiro-sonar jobs: - gerrit-maven-sonar cron: 'H 11 * * *' @@ -24,6 +24,80 @@ project: 'aaf/cadi' project-name: 'aaf-cadi' branch: 'master' + mvn-params: '-f shiro/pom.xml' mvn-settings: 'aaf-cadi-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' +# Though the below docker jobs have "aai" in the name, there is no aai code involved. +- project: + name: aaf-cadi-fproxy + project-name: 'aaf-cadi-fproxy' + jobs: + - '{project-name}-{stream}-aai-docker-java-daily': + pom: 'sidecar/fproxy/pom.xml' + mvn-goals: 'docker:build' + project: 'aaf/cadi' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aaf-cadi-settings' + files: '**' + archive-artifacts: '' + +- project: + name: aaf-cadi-fproxy-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-builder-4c-4g + project: 'aaf/cadi' + project-name: 'aaf-cadi-fproxy' + branch: 'master' + mvn-params: '-f sidecar/fproxy/pom.xml' + mvn-settings: 'aaf-cadi-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: aaf-cadi-rproxy + project-name: 'aaf-cadi-rproxy' + jobs: + - '{project-name}-{stream}-aai-docker-java-daily': + pom: 'sidecar/rproxy/pom.xml' + mvn-goals: 'docker:build' + project: 'aaf/cadi' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aaf-cadi-settings' + files: '**' + archive-artifacts: '' + +- project: + name: aaf-cadi-rproxy-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-builder-4c-4g + project: 'aaf/cadi' + project-name: 'aaf-cadi-rproxy' + branch: 'master' + mvn-params: '-f sidecar/rproxy/pom.xml' + mvn-settings: 'aaf-cadi-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: aaf-cadi-tproxy-config + project-name: 'aaf-cadi-tproxy-config' + jobs: + - '{project-name}-{stream}-aai-docker-java-daily': + pom: 'sidecar/tproxy-config/pom.xml' + mvn-goals: 'docker:build' + project: 'aaf/cadi' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aaf-cadi-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/aaf/aaf-csit.yaml b/jjb/aaf/aaf-csit.yaml index aec49b368..42aefcf38 100644 --- a/jjb/aaf/aaf-csit.yaml +++ b/jjb/aaf/aaf-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'aafapi': - trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' branch: 'master' diff --git a/jjb/aaf/aaf-sms-csit.yaml b/jjb/aaf/aaf-sms-csit.yaml index 474ca8b60..4e7f3ab08 100644 --- a/jjb/aaf/aaf-sms-csit.yaml +++ b/jjb/aaf/aaf-sms-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sms-test-plan': - trigger_jobs: - - 'aaf-sms-master-docker-golang-shell-daily' + trigger_jobs: 'aaf-sms-master-docker-golang-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index c11971017..56b992561 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 bc3b073be..2df4345c1 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-csit.yaml b/jjb/aai/aai-csit.yaml index 1c4f0fde5..059340fdb 100644 --- a/jjb/aai/aai-csit.yaml +++ b/jjb/aai/aai-csit.yaml @@ -12,13 +12,10 @@ branch: beijing functionality: - 'resources': - trigger_jobs: - - 'aai-resources-{stream}-aai-docker-java-daily' + trigger_jobs: 'aai-resources-{stream}-aai-docker-java-daily' - 'traversal': - trigger_jobs: - - 'aai-traversal-{stream}-aai-docker-java-daily' + trigger_jobs: 'aai-traversal-{stream}-aai-docker-java-daily' - 'esr-server': - trigger_jobs: - - 'aai-esr-server-{stream}-docker-java-daily' + trigger_jobs: 'aai-esr-server-{stream}-docker-java-daily' robot-options: '' diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml new file mode 100644 index 000000000..cda1885a7 --- /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 a3ff36b7d..25366b74c 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 4d6448aac..e88c0f90c 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 6c4eec0c1..830ff4326 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/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml index 52a53a8f6..7e4e9cde4 100644 --- a/jjb/appc/appc-csit.yaml +++ b/jjb/appc/appc-csit.yaml @@ -10,6 +10,5 @@ branch: master functionality: - 'healthcheck': - trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml new file mode 100644 index 000000000..d42d20768 --- /dev/null +++ b/jjb/appc/appc-parent.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: appc-parent + project-name: 'appc-parent' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'appc/parent' + stream: + - 'master': + branch: 'master' + mvn-settings: 'appc-parent-settings' + build-node: ubuntu1604-builder-2c-1g diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index 79b0f687e..44d203078 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'healthcheck': - trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' branch: 'master' diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml deleted file mode 100644 index 73c0bee43..000000000 --- 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/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml index 2ea6d1e10..5a81ffa8b 100644 --- a/jjb/clamp/clamp-csit.yaml +++ b/jjb/clamp/clamp-csit.yaml @@ -8,10 +8,8 @@ stream: 'master' functionality: - 'APIs': - trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' - 'UIs': - trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index 7ea128c26..4a029799a 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/dcaegen2/dcaegen2-csit.yaml b/jjb/dcaegen2/dcaegen2-csit.yaml index c9092c171..c68a9c153 100644 --- a/jjb/dcaegen2/dcaegen2-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-csit.yaml @@ -1,5 +1,5 @@ - project: - name: dcaegen2-csit + name: dcaegen2-testsuites-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' @@ -8,12 +8,23 @@ - 'master': branch: 'master' functionality: - - 'testsuites': - trigger_jobs: - - 'dcaegen2-master-merge-java' - - 'dcaegen2-collectors-ves-master-merge-java' - - 'prh-testsuites': - trigger_jobs: - - 'dcaegen2-master-merge-java' - - 'dcaegen2-services-prh-master-merge-java' + - 'testsuites' + trigger_jobs: + - 'dcaegen2-master-merge-java' + - 'dcaegen2-collectors-ves-master-merge-java' + robot-options: '' +- project: + name: dcaegen2-prh-testsuites-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dcaegen2' + stream: + - 'master': + branch: 'master' + functionality: + - 'prh-testsuites' + trigger_jobs: + - 'dcaegen2-master-merge-java' + - 'dcaegen2-services-prh-master-merge-java' robot-options: '' diff --git a/jjb/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml new file mode 100644 index 000000000..1ba6d5d58 --- /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-csit.yaml b/jjb/dmaap/dmaap-csit.yaml index e4daebc44..6954c660c 100644 --- a/jjb/dmaap/dmaap-csit.yaml +++ b/jjb/dmaap/dmaap-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'mrpubsub': - trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + 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 000000000..0a15b18ce --- /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/externalapi/externalapi-nbi-csit.yaml b/jjb/externalapi/externalapi-nbi-csit.yaml index 8f15b48e8..ddba04251 100644 --- a/jjb/externalapi/externalapi-nbi-csit.yaml +++ b/jjb/externalapi/externalapi-nbi-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'healthcheck': - trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' branch: 'master' diff --git a/jjb/holmes/holmes-csit.yaml b/jjb/holmes/holmes-csit.yaml index 02ce537fb..9d2323aaf 100644 --- a/jjb/holmes/holmes-csit.yaml +++ b/jjb/holmes/holmes-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'holmes-rule-management-master-docker-java-daily' + trigger_jobs: 'holmes-rule-management-master-docker-java-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml index 55d66d415..5c9335f29 100644 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml +++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'APIs': - trigger_jobs: - - '{project-name}-{stream}-release-version-java-daily' + trigger_jobs: '{project-name}-{stream}-release-version-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/msb/msb-csit.yaml b/jjb/msb/msb-csit.yaml index 9dada47b6..3b4df5f7b 100644 --- a/jjb/msb/msb-csit.yaml +++ b/jjb/msb/msb-csit.yaml @@ -8,16 +8,12 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'msb-discovery-master-docker-java-version-shell-daily' + trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily' - 'rest-service': - trigger_jobs: - - 'msb-discovery-master-docker-java-version-shell-daily' + trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily' - 'tcp-service': - trigger_jobs: - - 'msb-discovery-master-docker-java-version-shell-daily' + trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily' - 'iag-redirect-discovery': - trigger_jobs: - - 'msb-discovery-master-docker-java-version-shell-daily' + trigger_jobs: 'msb-discovery-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-csit.yaml b/jjb/multicloud/multicloud-csit.yaml index 770df5417..1687e9c98 100644 --- a/jjb/multicloud/multicloud-csit.yaml +++ b/jjb/multicloud/multicloud-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'functionality1': - trigger_jobs: - - '{project-name}-{stream}-multivimbroker-merge-java' + trigger_jobs: '{project-name}-{stream}-multivimbroker-merge-java' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml index e60ab6301..404577d48 100644 --- a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml @@ -8,10 +8,8 @@ stream: 'master' functionality: - 'functionality1': - trigger_jobs: - - 'multicloud-openstack-master-docker-java-version-shell-daily' + trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' - 'hpa-discovery': - trigger_jobs: - - 'multicloud-openstack-master-docker-java-version-shell-daily' + trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-pike-csit.yaml b/jjb/multicloud/multicloud-openstack-pike-csit.yaml index 2a1d887a0..f61f66dd8 100644 --- a/jjb/multicloud/multicloud-openstack-pike-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-pike-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'functionality1': - trigger_jobs: - - 'multicloud-openstack-master-docker-java-version-shell-daily' + trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml index a0ea6a65b..6d1fc12fe 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'functionality1': - trigger_jobs: - - 'multicloud-openstack-vmware-master-docker-java-version-shell-daily' + trigger_jobs: 'multicloud-openstack-vmware-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml index 34ee2017a..fa8dfd454 100644 --- a/jjb/multicloud/multicloud-openstack-windriver-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-windriver-csit.yaml @@ -7,7 +7,6 @@ stream: 'master' functionality: - 'functionality1': - trigger_jobs: - - 'multicloud-openstack-master-docker-java-version-shell-daily' + trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/music/music-csit.yaml b/jjb/music/music-csit.yaml index 7172e7a59..a0dbc8184 100644 --- a/jjb/music/music-csit.yaml +++ b/jjb/music/music-csit.yaml @@ -8,8 +8,7 @@ stream: 'master' functionality: - 'music-test-plan': - trigger_jobs: - - 'music-master-docker-version-java-daily' + trigger_jobs: 'music-master-docker-version-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml index 14a64ca10..ca94fcdbc 100644 --- a/jjb/music/music-distributed-kv-store-csit.yaml +++ b/jjb/music/music-distributed-kv-store-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'music-distributed-kv-store-test-plan': - trigger_jobs: - - 'music-distributed-kv-store-master-docker-golang-shell-daily' + trigger_jobs: 'music-distributed-kv-store-master-docker-golang-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/openci/create-ape.sh b/jjb/openci/create-ape.sh index 3a4c8afaf..5bd3a0676 100755 --- a/jjb/openci/create-ape.sh +++ b/jjb/openci/create-ape.sh @@ -11,19 +11,37 @@ set -o errexit set -o nounset set -o pipefail +# workaround for https://github.com/pypa/virtualenv/issues/1029 +export PS1=${PS1:-} + # 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 -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 } }" +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 d328e2530..b956da779 100644 --- a/jjb/openci/openci-onap-daily-jobs.yaml +++ b/jjb/openci/openci-onap-daily-jobs.yaml @@ -45,25 +45,19 @@ default: "'autorelease': 'SUCCESS'" description: 'The confidence level the published artifact gained' + wrappers: + - credentials-binding: + - username-password-separated: + credential-id: openci-connect-activemq + username: ACTIVEMQ_USER + password: ACTIVEMQ_PASSWORD + - workspace-cleanup + 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 +76,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/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml index 459c4987e..f0d2156bc 100644 --- a/jjb/optf/optf-has-csit.yaml +++ b/jjb/optf/optf-has-csit.yaml @@ -12,7 +12,6 @@ branch: beijing functionality: - 'has': - trigger_jobs: - - 'optf-has-master-conductor-docker-java-version-shell-daily' + trigger_jobs: 'optf-has-master-conductor-docker-java-version-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index cff66166a..321d3ad1b 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -1,18 +1,43 @@ - project: - name: policy-csit + name: policy-health-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'policy' stream: 'master' functionality: - - 'health': - trigger_jobs: - - 'policy-engine-{stream}-merge-scm-mvn-script' - - 'policy-drools-pdp-{stream}-merge-scm-mvn-script' - - 'policy-drools-applications-{stream}-merge-java' - - 'apex-pdp': - trigger_jobs: - - 'policy-apex-pdp-{stream}-merge-scm-mvn-script' + - 'health' + trigger_jobs: + - 'policy-engine-{stream}-merge-scm-mvn-script' + - 'policy-drools-pdp-{stream}-merge-scm-mvn-script' + - 'policy-drools-applications-{stream}-merge-java' + robot-options: '' + branch: 'master' + +- project: + name: policy-apex-pdp-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'policy' + stream: 'master' + functionality: + - 'apex-pdp' + trigger_jobs: + - 'policy-apex-pdp-{stream}-merge-scm-mvn-script' + robot-options: '' + branch: 'master' + +- project: + name: policy-distribution-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'policy' + stream: 'master' + functionality: + - 'distribution' + trigger_jobs: + - 'policy-distribution-{stream}-merge-java' robot-options: '' branch: 'master' diff --git a/jjb/portal-sdk/portal-sdk-csit.yaml b/jjb/portal-sdk/portal-sdk-csit.yaml index 111484a92..c5667e63d 100644 --- a/jjb/portal-sdk/portal-sdk-csit.yaml +++ b/jjb/portal-sdk/portal-sdk-csit.yaml @@ -7,7 +7,6 @@ stream: 'master' functionality: - 'testsuite': - trigger_jobs: - - 'portal-docker-{stream}-merge-docker-script' + trigger_jobs: 'portal-docker-{stream}-merge-docker-script' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/portal/portal-csit.yaml b/jjb/portal/portal-csit.yaml index a8e961223..697db4640 100644 --- a/jjb/portal/portal-csit.yaml +++ b/jjb/portal/portal-csit.yaml @@ -7,7 +7,6 @@ stream: 'master' functionality: - 'testsuite': - trigger_jobs: - - 'portal-docker-{stream}-merge-docker-script' + trigger_jobs: 'portal-docker-{stream}-merge-docker-script' robot-options: '' branch: 'master' diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index db3db4ca2..c5d7261ff 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -10,14 +10,11 @@ branch: 'master' functionality: - 'sanity': - trigger_jobs: - - '{project-name}-{stream}-sdc-merge-java' + trigger_jobs: '{project-name}-{stream}-sdc-merge-java' - 'nightly': - trigger_jobs: - - '{project-name}-{stream}-docker-version-java-daily' + trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' - 'uiSanity': - trigger_jobs: - - '{project-name}-{stream}-docker-version-java-daily' + trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' robot-options: '' branch: 'master' html-dir: 'archives' diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml index 1cd1eb94a..12d697518 100644 --- a/jjb/sdnc/sdnc-csit.yaml +++ b/jjb/sdnc/sdnc-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'healthcheck': - trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' branch: 'master' diff --git a/jjb/sdnc/sdnc-features.yaml b/jjb/sdnc/sdnc-features.yaml deleted file mode 100644 index 12accbb16..000000000 --- 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 551b79df5..000000000 --- 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/so/so-csit.yaml b/jjb/so/so-csit.yaml index 947cde5fb..288e6f4dc 100644 --- a/jjb/so/so-csit.yaml +++ b/jjb/so/so-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'integration-testing': - trigger_jobs: - - 'so-master-docker-version-java-daily' + trigger_jobs: 'so-master-docker-version-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml deleted file mode 100644 index afa41dd12..000000000 --- a/jjb/ui/ui-dmaapbc.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- project: - name: ui-dmaapbc - project-name: 'ui-dmaapbc' - - jobs: - - gerrit-maven-clm - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - project: 'ui/dmaapbc' - stream: - - 'master': - branch: 'master' - - 'release-1.1.0': - branch: 'release-1.1.0' - mvn-settings: 'ui-dmaapbc-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - diff --git a/jjb/usecaseui/usecase-ui-server-csit.yaml b/jjb/usecaseui/usecase-ui-server-csit.yaml index 96869fd15..b348d065f 100644 --- a/jjb/usecaseui/usecase-ui-server-csit.yaml +++ b/jjb/usecaseui/usecase-ui-server-csit.yaml @@ -7,7 +7,6 @@ stream: 'master' functionality: - 'testsuite': - trigger_jobs: - - '{project-name}-{stream}-docker-java-daily' + trigger_jobs: '{project-name}-{stream}-docker-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml index 7280f735e..9915a4408 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-gvnfm-vnflcm-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-gvnfm-vnflcm-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml index f8436a65a..cc68c4ac0 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-gvnfm-vnfmgr-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-gvnfm-vnfmgr-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml index afb3ccd3d..008ef3c30 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-gvnfm-vnfres-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-gvnfm-vnfres-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-catalog-csit.yaml b/jjb/vfc/vfc-nfvo-catalog-csit.yaml index 8a4269cb7..9affcfc05 100644 --- a/jjb/vfc/vfc-nfvo-catalog-csit.yaml +++ b/jjb/vfc/vfc-nfvo-catalog-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-catalog-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-nfvo-catalog-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml index 312528866..f022d9707 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-driver-ems-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-nfvo-driver-ems-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml index f433b0639..842d67175 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-driver-sfc-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-nfvo-driver-sfc-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml index 3edde732b..8107792fc 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-driver-vnfm-gvnfm-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-nfvo-driver-vnfm-gvnfm-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml index d97117683..734273893 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-driver-vnfm-svnfm-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-nfvo-driver-vnfm-svnfm-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-lcm-csit.yaml b/jjb/vfc/vfc-nfvo-lcm-csit.yaml index f5ad31137..d5480c23a 100644 --- a/jjb/vfc/vfc-nfvo-lcm-csit.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-lcm-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-nfvo-lcm-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml index 580443fd2..4f091ac0d 100644 --- a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml +++ b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-multivimproxy-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-nfvo-multivimproxy-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml index 354bd3724..3f62a53e3 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-resmanagement-master-docker-java-version-shell-daily' + trigger_jobs: 'vfc-nfvo-resmanagement-master-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml index b23a90d7b..a9fcfdbf5 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml @@ -7,9 +7,9 @@ project-name: 'vfc-nfvo-wfengine' stream: 'master' functionality: - - 'sanity-check': - trigger_jobs: - - 'vfc-nfvo-wfengine-master-engine-activiti-extension-docker-java-version-shell-daily' - - 'vfc-nfvo-wfengine-master-engine-mgr-service-docker-java-version-shell-daily' + - 'sanity-check' + trigger_jobs: + - 'vfc-nfvo-wfengine-master-engine-activiti-extension-docker-java-version-shell-daily' + - 'vfc-nfvo-wfengine-master-engine-mgr-service-docker-java-version-shell-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml index b1124ab70..2b3562fd1 100644 --- a/jjb/vid/vid-csit.yaml +++ b/jjb/vid/vid-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'healthCheck': - trigger_jobs: - - '{project-name}-{stream}-docker-version-java-daily' + trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml index 56634b547..e34fd7403 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml @@ -8,7 +8,6 @@ stream: 'master' functionality: - 'sanity-check': - trigger_jobs: - - '{project-name}-{stream}-merge-java' + trigger_jobs: '{project-name}-{stream}-merge-java' robot-options: '' branch: 'master' diff --git a/jjb/vvp/vvp-gitlab.yaml b/jjb/vvp/vvp-gitlab.yaml index 5a91e291a..47c553ea6 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 6b19f83cd..8d46eba02 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 da1b896ac..6a5015443 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 3f4dcfdca..22b60efe8 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 72cee62ab..8dd6cd9a4 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' diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index 7bb1c0314..acf6fa422 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -168,14 +168,14 @@ - name: Download Firefox version 55.0.3 unarchive: src: https://download-installer.cdn.mozilla.net/pub/firefox/releases/55.0.3/linux-x86_64/en-US/firefox-55.0.3.tar.bz2 - dest: /tmp + dest: /opt mode: 0755 remote_src: yes become: true - name: Create symbolic link to firefox bin file: - src: "/usr/bin/firefox-bin/firefox/firefox" + src: "/opt/firefox/firefox" dest: "/usr/bin/firefox" state: link become: true |