Merge "Set build-timeout to 180 for dcaegen2-deployments"

diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
index e3cd68c..c98d053 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180817-215307.947
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180824-193210.563
 LABELS=queue-docker-4c-4g
 HARDWARE_ID=v2-highcpu-4
 INSTANCE_CAP=1

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
index f852426..4f82e4c 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180817-215307.947
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180824-193210.563
 LABELS=ubuntu1604-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8

diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml
index b8ccf73..e0b7988 100644 (file)
--- a/jjb/aaf/aaf-sms.yaml
+++ b/jjb/aaf/aaf-sms.yaml
@@ -5,7 +5,6 @@
     subproject: 'aaf-sms-client'
     path: 'sms-service/src'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-golang'
       - '{project-name}-{stream}-merge-golang'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily':

diff --git a/jjb/aaf/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml
index 7e007ec..263e5f5 100644 (file)
--- a/jjb/aaf/aaf-sshsm.yaml
+++ b/jjb/aaf/aaf-sshsm.yaml
@@ -5,7 +5,6 @@
     build-timeout: 60
     project: 'aaf/sshsm'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-c':
          script:
             !include-raw-escape: 'build-sshsm.sh'

diff --git a/jjb/aaf/build-sshsm-docker-images.sh b/jjb/aaf/build-sshsm-docker-images.sh
index b70c13d..b0c8882 100755 (executable)
--- a/jjb/aaf/build-sshsm-docker-images.sh
+++ b/jjb/aaf/build-sshsm-docker-images.sh
@@ -5,7 +5,7 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
 CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 
-echo 'Building AAF/sshsm base containers'
-cd bin/base
-chmod 755 build_base_images.sh
-sh build_base_images.sh
+echo 'Building AAF/sshsm containers'
+cd bin
+chmod 755 build_images.sh
+./build_images.sh

diff --git a/jjb/aai/aai-aai-config.yaml b/jjb/aai/aai-aai-config.yaml
deleted file mode 100644 (file)
index 52cf5f3..0000000
--- a/jjb/aai/aai-aai-config.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-aai-config
-    project-name: 'aai-aai-config'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/aai-config'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-aai-config-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-aai-data.yaml b/jjb/aai/aai-aai-data.yaml
deleted file mode 100644 (file)
index e012c05..0000000
--- a/jjb/aai/aai-aai-data.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-aai-data
-    project-name: 'aai-aai-data'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/aai-data'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-aai-data-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-eis.yaml b/jjb/aai/aai-eis.yaml
deleted file mode 100644 (file)
index 66f20e5..0000000
--- a/jjb/aai/aai-eis.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-eis
-    project-name: 'aai-eis'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/eis'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-eis-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-gap.yaml b/jjb/aai/aai-gap.yaml
deleted file mode 100644 (file)
index 4854bd0..0000000
--- a/jjb/aai/aai-gap.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-gap
-    project-name: 'aai-gap'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/gap'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-gap-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
deleted file mode 100644 (file)
index 5e5ef52..0000000
--- a/jjb/aai/aai-graphgraph.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-graphgraph
-    project-name: 'aai-graphgraph'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/graphgraph'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-graphgraph-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-tabular-data-service.yaml b/jjb/aai/aai-tabular-data-service.yaml
deleted file mode 100644 (file)
index d673f83..0000000
--- a/jjb/aai/aai-tabular-data-service.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-tabular-data-service
-    project-name: 'aai-tabular-data-service'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/tabular-data-service'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-tabular-data-service-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-test-config.yaml b/jjb/aai/aai-test-config.yaml
deleted file mode 100644 (file)
index 19cf2b4..0000000
--- a/jjb/aai/aai-test-config.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: aai-test-config
-    project-name: 'aai-test-config'
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/test-config'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-test-config-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
new file mode 100644 (file)
index 0000000..d66e77a
--- /dev/null
+++ b/jjb/aai/aai-validation.yaml
@@ -0,0 +1,33 @@
+---
+- project:
+    name: aai-validation
+    project-name: 'aai-validation'
+    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: 'docker:build'
+    project: 'aai/validation'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-validation-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: aai-validation-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-builder-4c-4g
+    project: 'aai/validation'
+    project-name: 'aai-validation'
+    branch: 'master'
+    mvn-settings: 'aai-validation-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file

diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml
index e0dfbfe..52a53a8 100644 (file)
--- a/jjb/appc/appc-csit.yaml
+++ b/jjb/appc/appc-csit.yaml
@@ -8,8 +8,6 @@
     stream:
       - 'master':
           branch: master
-      - 'beijing':
-          branch: 'beijing'
     functionality:
       - 'healthcheck':
           trigger_jobs:

diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index 601fd2b..2508076 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -12,7 +12,7 @@
     files: '**'
     maven-deploy-properties: |
       deployAtEnd=true
-    archive-artifacts: ''
+    archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html'
     build-node: ubuntu1604-docker-8c-8g
     jobs:
       - gerrit-maven-clm
@@ -26,15 +26,3 @@
           # No-op
           script: '/bin/true'
 
-- project:
-    name: dcaegen2-collectors-hv-ves-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'dcaegen2/collectors/hv-ves'
-    project-name: 'dcaegen2-collectors-hv-ves'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-collectors-hv-ves-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/dcaegen2/dcaegen2-csit.yaml b/jjb/dcaegen2/dcaegen2-csit.yaml
index c9092c1..a1a4929 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-csit.yaml
+++ b/jjb/dcaegen2/dcaegen2-csit.yaml
@@ -16,4 +16,7 @@
           trigger_jobs:
             - 'dcaegen2-master-merge-java'
             - 'dcaegen2-services-prh-master-merge-java'
+      - 'hv-ves-testsuites':
+          trigger_jobs:
+            - 'dcaegen2-collectors-hv-ves-master-merge-java'
     robot-options: ''

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
deleted file mode 100644 (file)
index 12e13a5..0000000
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- project:
-    name: dcaegen2-services-pm-mapper
-    # job template iterators
-    project-name: 'dcaegen2-services-pm-mapper'
-    stream:
-      - 'master':
-          branch: 'master'
-    # apply to all jobs
-    project: 'dcaegen2/services/pm-mapper'
-    mvn-settings: 'dcaegen2-services-pm-mapper-settings'
-    files: '**'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
-    jobs:
-      - gerrit-maven-clm
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-verify-java':
-          mvn-goals: 'clean install'
-      - '{project-name}-{stream}-merge-java':
-          mvn-goals: 'clean deploy'
-
-- project:
-    name: dcaegen2-services-pm-mapper-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'dcaegen2/services/pm-mapper'
-    project-name: 'dcaegen2-services-pm-mapper'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-pm-mapper-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml
new file mode 100644 (file)
index 0000000..39202f2
--- /dev/null
+++ b/jjb/dmaap/dmaap-kafka-docker.yaml
@@ -0,0 +1,20 @@
+---
+
+- project:
+    name: dmaap-kafka-docker
+    project-name: 'dmaap-kafka-docker'
+    jobs:
+      - '{project-name}-{stream}-docker-version-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
+      - '{project-name}-{stream}-docker-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
+    project: 'dmaap/kafka11aaf'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dmaap-kafka11aaf-settings'
+    files: '**'
+    archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: 'docker'
+    build-node: ubuntu1604-docker-8c-8g

diff --git a/jjb/doc/doc-tools.yaml b/jjb/doc/doc-tools.yaml
deleted file mode 100644 (file)
index f3112cd..0000000
--- a/jjb/doc/doc-tools.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- project:
-    name: doc-tools
-    project-name: 'doc-tools'
-    jobs:
-      - gerrit-maven-clm
-    project: 'doc/tools'
-    mvn-settings: 'doc-tools-settings'
-    stream:
-      - master:
-          branch: 'master'

diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index 538885f..53409de 100644 (file)
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -3,7 +3,6 @@
     name: doc
     project-name: 'doc'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-rtd':
           build-node: centos7-builder-4c-4g
       - '{project-name}-{stream}-merge-rtd'

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 55711f0..d32e53d 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -391,6 +391,48 @@
                 - compare-type: 'ANT'
                   pattern: '{files}'
 
+- trigger:
+    name: gerrit-trigger-helm-patch-submitted
+    triggers:
+      - gerrit:
+          server-name: '{server}'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: '^verify-helm$'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: 'ANT'
+                  pattern: '{files}'
+
+- trigger:
+    name: gerrit-trigger-helm-patch-merged
+    triggers:
+      - gerrit:
+          server-name: '{server}'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: '^remerge-helm$'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: 'ANT'
+                  pattern: '{files}'
+
 - trigger:
     name: gerrit-trigger-release-manually
     triggers:

diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index 038b359..d412d9b 100644 (file)
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -14,6 +14,7 @@
 
     # default params for helm jobs
     pre_build_script: ''
+    build_script: ''
     post_build_script: ''
 
     #####################
@@ -42,10 +43,14 @@
     publishers:
       - lf-infra-publish
 
-- helm_verify_boiler_plate: &helm_verify_boiler_plate
-    name: helm_verify_boiler_plate
+#################
+# JOB TEMPLATES #
+#################
+- job-template:
+    name: '{project-name}-{stream}-verify-helm'
+    # Job template for helm verify jobs
 
-    concurrent: true
+    <<: *helm_job_boiler_plate
 
     scm:
       - gerrit-trigger-scm:
@@ -54,15 +59,22 @@
           submodule-recursive: '{submodule-recursive}'
 
     triggers:
-      - gerrit-trigger-patch-submitted:
+      - gerrit-trigger-helm-patch-submitted:
           status-context: '{project}-Helm-Verify'
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '{files}'
 
-- helm_merge_boiler_plate: &helm_merge_boiler_plate
-    name: helm_merge_boiler_plate
+    builders:
+      - shell: '{obj:pre_build_script}'
+      - shell: '{obj:build_script}'
+
+- job-template:
+    name: '{project-name}-{stream}-merge-helm'
+    # Job template for Helm merge jobs
+
+    <<: *helm_job_boiler_plate
 
     scm:
       - gerrit-trigger-scm:
@@ -71,51 +83,67 @@
           submodule-recursive: '{submodule-recursive}'
 
     triggers:
-      - gerrit-trigger-patch-merged:
+      - gerrit-trigger-helm-patch-merged:
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '{files}'
-      - pollscm:
-          cron: ''
-
-#################
-# JOB TEMPLATES #
-#################
-- job-template:
-    name: '{project-name}-{stream}-verify-helm'
-    # Job template for helm verify jobs
-
-    <<: *helm_job_boiler_plate
-    # yamllint disable-line rule:key-duplicates
-    <<: *helm_verify_boiler_plate
 
     builders:
-      - shell: '{pre_build_script}'
-      - shell: '{build_script}'
-      - shell: '{post_build_script}'
+      - lf-provide-maven-settings:
+          global-settings-file: '{mvn-global-settings}'
+          settings-file: '{mvn-settings}'
+      - shell: '{obj:pre_build_script}'
+      - shell: '{obj:build_script}'
+      - lf-infra-create-netrc:
+          server-id: oom-helm
+      - inject:
+          properties-content: |
+            BUILD_TYPE=snapshot
+      - shell: '{obj:post_build_script}'
+      - lf-provide-maven-settings-cleanup
 
 - job-template:
-    name: '{project-name}-{stream}-merge-helm'
-    # Job template for Helm merge jobs
+    name: '{project-name}-{stream}-stage-helm'
+    # Job template for Helm stage jobs
 
     <<: *helm_job_boiler_plate
-    # yamllint disable-line rule:key-duplicates
-    <<: *helm_merge_boiler_plate
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
+
+    triggers:
+      - pollscm:
+          cron: '0 22 * * *'
+      - gerrit:
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: '^stage-helm$'
 
     builders:
-      - shell: '{pre_build_script}'
-      - shell: '{build_script}'
-      - shell: '{post_build_script}'
+      - lf-provide-maven-settings:
+          global-settings-file: '{mvn-global-settings}'
+          settings-file: '{mvn-settings}'
+      - shell: '{obj:pre_build_script}'
+      - shell: '{obj:build_script}'
+      - lf-infra-create-netrc:
+          server-id: oom-helm
+      - inject:
+          properties-content: |
+            BUILD_TYPE=staging
+      - shell: '{obj:post_build_script}'
+      - lf-provide-maven-settings-cleanup
 
 - job-template:
     name: '{project-name}-{subproject}-{stream}-verify-helm'
     # Job template for helm verify jobs
 
     <<: *helm_job_boiler_plate
-    # yamllint disable-line rule:key-duplicates
-    <<: *helm_verify_boiler_plate
 
+    disabled: true
     builders:
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
@@ -126,9 +154,8 @@
     # Job template for helm merge jobs
 
     <<: *helm_job_boiler_plate
-    # yamllint disable-line rule:key-duplicates
-    <<: *helm_merge_boiler_plate
 
+    disabled: true
     builders:
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
@@ -142,6 +169,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
     <<: *helm_job_boiler_plate
 
+    disabled: true
     scm:
       - lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'

diff --git a/jjb/integration/integration-seccom.yaml b/jjb/integration/integration-seccom.yaml
deleted file mode 100644 (file)
index fac83ca..0000000
--- a/jjb/integration/integration-seccom.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: integration-seccom
-    project-name: 'integration-seccom'
-    jobs:
-      - gerrit-maven-clm
-    project: 'integration/seccom'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'integration-seccom-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 1cd96b4..f8d59c9 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -39,7 +39,7 @@
           server: '{server-name}'
           project: 'integration'
           branch: '{branch}'
-          files: 'test/csit/**/{project-name}/**'
+          files: 'test/csit/**/{project-name}/{functionality}/**'
 
     builders:
       - integration-install-robotframework
@@ -97,7 +97,7 @@
           server: '{server-name}'
           project: 'integration'
           branch: '{branch}'
-          files: 'test/csit/**/{project-name}/**'
+          files: 'test/csit/**/{project-name}/{functionality}/**'
 
     builders:
       - integration-install-robotframework
@@ -169,7 +169,7 @@
           server: '{server-name}'
           project: 'integration'
           branch: '{branch}'
-          files: 'test/csit/**/{project-name}/**'
+          files: 'test/csit/**/{project-name}/{functionality}/**'
       - timed: '@daily'
       - reverse:
           jobs: '{obj:trigger_jobs}'
@@ -230,7 +230,7 @@
           server: '{server-name}'
           project: 'integration'
           branch: '{branch}'
-          files: 'test/csit/**/{project-name}/**'
+          files: 'test/csit/**/{project-name}/{functionality}/**'
       - timed: '@daily'
       - reverse:
           jobs: '{obj:trigger_jobs}'

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 6c700fb..e97f0ab 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -3,7 +3,8 @@
     name: integration
     project-name: 'integration'
     jobs:
-      - gerrit-maven-clm
+      - gerrit-maven-clm:
+          mvn-params: '-f version-manifest/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-version-java-daily'

diff --git a/jjb/lab/lab-templates.yaml b/jjb/lab/lab-templates.yaml
index 5f46494..ff7a59d 100644 (file)
--- a/jjb/lab/lab-templates.yaml
+++ b/jjb/lab/lab-templates.yaml
@@ -31,6 +31,6 @@
 
     publishers:
       - integration-robot:
-          unstable-if: 75.0
+          unstable-if: 60.0
           pass-if: 100.0
       - lf-infra-publish

diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
new file mode 100644 (file)
index 0000000..1cc4f13
--- /dev/null
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -0,0 +1,16 @@
+---
+- project:
+    name: multicloud-k8s
+    project-name: 'multicloud-k8s'
+    path: 'src/k8splugin'
+    jobs:
+      - '{project-name}-{stream}-verify-golang'
+      - '{project-name}-{stream}-merge-golang'
+    project: 'multicloud/k8s'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'multicloud-k8s-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/multicloud/multicloud-openstack-pike-csit.yaml b/jjb/multicloud/multicloud-openstack-pike-csit.yaml
index ce036f1..2a1d887 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-pike-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-pike-csit.yaml
@@ -4,14 +4,11 @@
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'multicloud-openstack-pike'
+    project-name: 'multicloud-pike'
     stream: 'master'
     functionality:
       - 'functionality1':
           trigger_jobs:
             - 'multicloud-openstack-master-docker-java-version-shell-daily'
-      - 'hpa-discovery':
-          trigger_jobs:
-            - 'multicloud-openstack-master-docker-java-version-shell-daily'
     robot-options: ''
     branch: 'master'

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 11a9ac3..7b2c7c9 100644 (file)
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -4,9 +4,22 @@
     project-name: oom
     project: oom
     mvn-settings: oom-settings
+    mvn-global-settings: global-settings
     archive-artifacts: ''
     build-node: ubuntu1604-helm-2c-1g
     pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
+    oom_build_script: |
+        #!/bin/bash
+        set -e -o pipefail
+        cd kubernetes/
+        make all
+    subproject_build_script: |
+        #!/bin/bash
+        cd kubernetes/
+        make common
+        make {subproject}'
+    oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
+
     stream:
       - 'master':
           branch: 'master'
@@ -69,15 +82,22 @@
 
     jobs:
       - '{project-name}-{stream}-verify-helm':
-          build_script: 'cd kubernetes/ && make all'
+          build_script: '{oom_build_script}'
           files: '**'
       - '{project-name}-{stream}-merge-helm':
-          build_script: 'cd kubernetes/ && make all'
+          build_script: '{oom_build_script}'
+          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
+          files: '**'
+      - '{project-name}-{stream}-stage-helm':
+          build_script: '{oom_build_script}'
+          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
           files: '**'
+
+      # Below jobs disabled until future need.
       - '{project-name}-{subproject}-{stream}-verify-helm':
-          build_script: 'cd kubernetes/ && make common && make {subproject}'
+          build_script: '{subproject_build_script}'
       - '{project-name}-{subproject}-{stream}-merge-helm':
-          build_script: 'cd kubernetes/ && make common && make {subproject}'
+          build_script: '{subproject_build_script}'
       - '{project-name}-{stream}-update-helm-weekly':
+          build_script: '{oom_build_script}'
           files: '**'
-          build_script: 'cd kubernetes/ && make all'

diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml
index 10d574c..ed428f6 100644 (file)
--- a/jjb/oom/oom-oneclick-config.yaml
+++ b/jjb/oom/oom-oneclick-config.yaml
@@ -11,7 +11,6 @@
    submodule-recursive: true
 
    jobs:
-     - gerrit-maven-clm
      - '{project}-{stream}-release-config'
    stream:
      - 'master':

diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index 0e20414..db3db4c 100644 (file)
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -8,8 +8,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     functionality:
       - 'sanity':
           trigger_jobs:
@@ -23,4 +21,4 @@
     robot-options: ''
     branch: 'master'
     html-dir: 'archives'
-    html-files: 'SDC_CI_Extent_Report.html'
\ No newline at end of file
+    html-files: 'SDC_CI_Extent_Report.html'

diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml
index a11d53e..292bf85 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-ci.yaml
+++ b/jjb/sdc/sdc-dcae-d-ci.yaml
@@ -30,5 +30,6 @@
     project-name: 'sdc-dcae-d-ci'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-ci-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
index d2f6233..ae44b01 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
@@ -30,5 +30,6 @@
     project-name: 'sdc-dcae-d-dt-be-main'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
index e1c63c2..60eebbc 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml
@@ -26,5 +26,6 @@
     project-name: 'sdc-dcae-d-dt-be-property'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-dt-be-property-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml
index ac0f566..92eea54 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt.yaml
@@ -10,7 +10,7 @@
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-docker-version-java-daily':
           docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
+          mvn-profile: 'server,docker'
           mvn-params: '-DskipTests=true'
     project: 'sdc/dcae-d/dt'
     stream:
@@ -31,5 +31,6 @@
     project-name: 'sdc-dcae-d-dt'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-dt-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml
index 4b13a9e..4142e85 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-fe.yaml
+++ b/jjb/sdc/sdc-dcae-d-fe.yaml
@@ -31,5 +31,6 @@
     project-name: 'sdc-dcae-d-fe'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-fe-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
index 1fec7f7..fce057b 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
+++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
@@ -25,5 +25,6 @@
     project-name: 'sdc-dcae-d-tosca-lab'
     branch: 'master'
     mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index a30fa6c..01890a0 100644 (file)
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -12,12 +12,11 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-jtosca-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-jtosca-sonar
@@ -29,6 +28,6 @@
     project-name: 'sdc-jtosca'
     branch: 'master'
     mvn-settings: 'sdc-jtosca-settings'
-    mvn-params: '-Dsonar.branch.name=${branch}'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-onap-ui.yaml b/jjb/sdc/sdc-onap-ui.yaml
index 3d02e68..2b09a24 100644 (file)
--- a/jjb/sdc/sdc-onap-ui.yaml
+++ b/jjb/sdc/sdc-onap-ui.yaml
@@ -15,6 +15,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-onap-ui-sonar
@@ -26,5 +27,6 @@
     project-name: 'sdc-onap-ui'
     branch: 'master'
     mvn-settings: 'sdc-onap-ui-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 36135d9..90606ad 100644 (file)
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -12,12 +12,11 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-sdc-distribution-client-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sdc-distribution-client-sonar
@@ -29,6 +28,6 @@
     project-name: 'sdc-sdc-distribution-client'
     branch: 'master'
     mvn-settings: 'sdc-sdc-distribution-client-settings'
-    mvn-params: '-Dsonar.branch.name=${branch}'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index 766d0af..c03e353 100644 (file)
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -11,9 +11,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-sdc-docker-base-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-8c-8g
+    maven-version: 'mvn35'

diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml
index 8d8a43d..294e82f 100644 (file)
--- a/jjb/sdc/sdc-sdc-pubsub.yaml
+++ b/jjb/sdc/sdc-sdc-pubsub.yaml
@@ -11,7 +11,6 @@
     name: sdc-sdc-pubsub
     project-name: 'sdc-sdc-pubsub'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
     project: 'sdc/sdc-pubsub'
@@ -22,6 +21,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sdc-pubsub-sonar
@@ -33,5 +33,6 @@
     project-name: 'sdc-sdc-pubsub'
     branch: 'master'
     mvn-settings: 'sdc-sdc-pubsub-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
index 035e0e0..128f02c 100644 (file)
--- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml
+++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
@@ -16,3 +16,4 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'

diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index b241aab..8baf6f7 100644 (file)
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -12,12 +12,11 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-sdc-tosca-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sdc-tosca-sonar
@@ -29,6 +28,6 @@
     project-name: 'sdc-sdc-tosca'
     branch: 'master'
     mvn-settings: 'sdc-sdc-tosca-settings'
-    mvn-params: '-Dsonar.branch.name=${branch}'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index efa3097..a7db7e6 100644 (file)
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -13,14 +13,13 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1604-builder-4c-4g
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sdc-workflow-designer-sonar
@@ -32,5 +31,6 @@
     project-name: 'sdc-sdc-workflow-designer'
     branch: 'master'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
+    mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 798325c..63a0c2e 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -22,12 +22,11 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-8c-8g
+    maven-version: 'mvn35'
 
 - project:
     name: sdc-sonar
@@ -39,6 +38,6 @@
     project-name: 'sdc'
     branch: 'master'
     mvn-settings: 'sdc-settings'
-    mvn-params: '-Djacoco.skip=false -Dsonar.branch.name=${branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
+    mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/so/so-chef-repo.yaml b/jjb/so/so-chef-repo.yaml
deleted file mode 100644 (file)
index 08acb54..0000000
--- a/jjb/so/so-chef-repo.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: so-chef-repo
-    project-name: 'so-chef-repo'
-    jobs:
-      - gerrit-maven-clm
-    project: 'so/chef-repo'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'so-chef-repo-settings'
-    files: '**'
-    archive-artifacts: ''

diff --git a/jjb/so/so-docker-config.yaml b/jjb/so/so-docker-config.yaml
deleted file mode 100644 (file)
index 0d61fc4..0000000
--- a/jjb/so/so-docker-config.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: so-docker-config
-    project-name: 'so-docker-config'
-    jobs:
-      - gerrit-maven-clm
-    project: 'so/docker-config'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'so-docker-config-settings'
-    files: '**'
-    archive-artifacts: ''

diff --git a/jjb/so/so-so-config.yaml b/jjb/so/so-so-config.yaml
deleted file mode 100644 (file)
index bf63719..0000000
--- a/jjb/so/so-so-config.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: so-so-config
-    project-name: 'so-so-config'
-    jobs:
-      - gerrit-maven-clm
-    project: 'so/so-config'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'so-so-config-settings'
-    files: '**'
-    archive-artifacts: ''

diff --git a/jjb/testsuite/testsuite-properties.yaml b/jjb/testsuite/testsuite-properties.yaml
deleted file mode 100644 (file)
index 252a249..0000000
--- a/jjb/testsuite/testsuite-properties.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: testsuite-properties-master
-    project-name: 'testsuite-properties'
-    jobs:
-      - gerrit-maven-clm
-    project: 'testsuite/properties'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'testsuite-properties-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g

diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml
index d5875a2..400170c 100644 (file)
--- a/jjb/testsuite/testsuite-python-testing-utils.yaml
+++ b/jjb/testsuite/testsuite-python-testing-utils.yaml
@@ -7,7 +7,6 @@
           path: '.'
           pattern: '**'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
 
     project: 'testsuite/python-testing-utils'

diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index 92d5ffa..f4a4652 100644 (file)
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -3,7 +3,6 @@
     name: testsuite
     project-name: 'testsuite'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-3scm-docker-shell-daily':
           script:
             !include-raw-escape: 'testsuite-docker.sh'

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 5a76dbc..6627d4d 100644 (file)
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -117,3 +117,48 @@
         name: google-chrome-stable
         state: present
       become: true
+
+    - name: Install Erlang dependency packages
+      apt:
+        name:
+          - libwxgtk3.0-0v5
+          - libsctp1
+          - libwxbase3.0-0v5
+      become: true
+
+    - name: Install Erlang
+      apt:
+        deb: https://packages.erlang-solutions.com/erlang/esl-erlang/FLAVOUR_1_general/esl-erlang_19.3.6-1~ubuntu~trusty_amd64.deb
+      install_recommends: yes
+      become: true
+
+    - name: Clone rebar3
+      git:
+        repo: 'https://github.com/erlang/rebar3.git'
+        dest: /tmp/rebar3
+
+    - name: Bootstrap rebar3
+      command: ./bootstrap
+      args:
+        chdir: /tmp/rebar3
+
+    - name: Install rebar3 to bin
+      copy:
+        src: /tmp/rebar3/rebar3
+        dest: /usr/bin/rebar3
+        mode: 0755
+        remote_src: true
+      become: true
+
+    - name: Remove unused rebar3 source
+      file:
+        path: /tmp/rebar3
+        state: absent
+
+    - name: Download geckodriver
+      unarchive:
+        src: https://github.com/mozilla/geckodriver/releases/download/v0.18.0/geckodriver-v0.18.0-linux64.tar.gz
+        dest: /usr/bin
+        mode: 0755
+        remote_src: yes
+      become: true

diff --git a/shell/publish_helm_charts.sh b/shell/publish_helm_charts.sh
new file mode 100755 (executable)
index 0000000..02a0c74
--- /dev/null
+++ b/shell/publish_helm_charts.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e -o pipefail
+cd kubernetes/dist/packages/ || exit
+helm_charts=()
+while IFS= read -a line; do
+    helm_charts+=( "$line" )
+done < <( ls )
+
+for chart in "${helm_charts[@]}"; do
+  chart=$(echo "$chart" | xargs)
+  case "$BUILD_TYPE" in
+    'snapshot')
+      echo "-n --upload-file $chart https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$chart"
+      curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$chart"
+      curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$GIT_COMMIT/$chart"
+      ;;
+    'staging')
+      curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$chart"
+      curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$GIT_COMMIT/$chart"
+      ;;
+    'release')
+      echo "Release automation not implemented yet."
+      exit 1
+        ;;
+    *)
+      echo "You must set BUILD_TYPE to one of (snapshot, staging, release)."
+      exit 1
+      ;;
+  esac
+done
+cd ../../../