diff options
| -rw-r--r-- | jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg | 2 | ||||
| -rw-r--r-- | jjb/aai/aai-csit.yaml | 4 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors-ves.yaml | 2 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 14 | ||||
| -rw-r--r-- | jjb/global-templates-helm.yaml | 166 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 468 | ||||
| -rw-r--r-- | jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml | 4 | ||||
| -rw-r--r-- | jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml | 1 | ||||
| -rw-r--r-- | jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml | 4 | ||||
| -rw-r--r-- | jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml | 4 | ||||
| -rw-r--r-- | jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml | 4 | ||||
| -rw-r--r-- | jjb/oom/oom-helm.yaml | 83 | ||||
| -rw-r--r-- | jjb/optf/optf-has.yaml | 1 | ||||
| -rw-r--r-- | jjb/optf/optf-osdf.yaml | 1 | ||||
| -rw-r--r-- | shell/helm-repo-init.sh | 9 |
15 files changed, 321 insertions, 446 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg index 4c0766cae..975b7494f 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=Ubuntu 16.04 - redis - 20180101-1003 +IMAGE_NAME=CentOS 7 - redis - 20180805-2225 LABELS=centos7-redis-4c-4g HARDWARE_ID=v2-highcpu-4 diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml index b72341018..1c4f0fde5 100644 --- a/jjb/aai/aai-csit.yaml +++ b/jjb/aai/aai-csit.yaml @@ -13,10 +13,10 @@ functionality: - 'resources': trigger_jobs: - - 'aai-resources-{stream}-aai-docker-java-version-daily' + - 'aai-resources-{stream}-aai-docker-java-daily' - 'traversal': trigger_jobs: - - 'aai-traversal-{stream}-aai-docker-java-version-daily' + - 'aai-traversal-{stream}-aai-docker-java-daily' - 'esr-server': trigger_jobs: - 'aai-esr-server-{stream}-docker-java-daily' diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 99df41f66..fbad319e1 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.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/ves' project-name: 'dcaegen2-collectors-ves' branch: 'master' diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 2bf008e55..55711f086 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -24,6 +24,20 @@ goals: '--version' - builder: + name: maven-set-release-version + builders: + - maven-target: + maven-version: '{maven-version}' + pom: '{pom}' + goals: 'versions:set versions:update-child-modules versions:commit -B' + properties: + - 'newVersion=${{release_version}}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + +- builder: name: maven-docker-push-release builders: - maven-target: diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml new file mode 100644 index 000000000..038b35936 --- /dev/null +++ b/jjb/global-templates-helm.yaml @@ -0,0 +1,166 @@ +--- +########### +# ANCHORS # +########### +- helm_job_boiler_plate: &helm_job_boiler_plate + name: helm_job_boiler_plate + + ###################### + # Default parameters # + ###################### + + branch: master + submodule-recursive: true + + # default params for helm jobs + pre_build_script: '' + post_build_script: '' + + ##################### + # Job Configuration # + ##################### + + project-type: freestyle + node: '{build-node}' + + properties: + - lf-infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - lf-infra-parameters: + branch: '{branch}' + project: '{project}' + stream: '{stream}' + lftools-version: '{lftools-version}' + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + publishers: + - lf-infra-publish + +- helm_verify_boiler_plate: &helm_verify_boiler_plate + name: helm_verify_boiler_plate + + concurrent: true + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + triggers: + - gerrit-trigger-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 + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + triggers: + - gerrit-trigger-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}' + +- job-template: + name: '{project-name}-{stream}-merge-helm' + # Job template for Helm merge jobs + + <<: *helm_job_boiler_plate + # yamllint disable-line rule:key-duplicates + <<: *helm_merge_boiler_plate + + builders: + - shell: '{pre_build_script}' + - shell: '{build_script}' + - shell: '{post_build_script}' + +- 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 + + builders: + - shell: '{pre_build_script}' + - shell: '{build_script}' + - shell: '{post_build_script}' + +- job-template: + name: '{project-name}-{subproject}-{stream}-merge-helm' + # Job template for helm merge jobs + + <<: *helm_job_boiler_plate + # yamllint disable-line rule:key-duplicates + <<: *helm_merge_boiler_plate + + builders: + - shell: '{pre_build_script}' + - shell: '{build_script}' + - shell: '{post_build_script}' + +- job-template: + name: '{project-name}-{stream}-update-helm-weekly' + # Job template for weekly helm update jobs + # + # Required Variables: + # branch: git branch (eg. stable/lithium or master) + <<: *helm_job_boiler_plate + + scm: + - lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '$GIT_URL/$PROJECT' + refspec: '$GERRIT_REFSPEC' + branch: '$GERRIT_BRANCH' + submodule-recursive: true + choosing-strategy: default + + builders: + - shell: '{pre_build_script}' + - shell: '{build_script}' + - shell: '{post_build_script}' + + triggers: + # 11 AM UTC + - timed: 'H 11 * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index f3bd189ae..25df505eb 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -227,15 +227,10 @@ steps: - inject: properties-file: version.properties - - maven-target: + - maven-set-release-version: maven-version: '{maven-version}' - goals: 'versions:set versions:update-child-modules versions:commit -B' - properties: - - 'newVersion=${{release_version}}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp + mvn-settings: '{mvn-settings}' + pom: - maven-target: maven-version: '{maven-version}' goals: 'clean deploy -B @@ -304,15 +299,10 @@ - inject: properties-file: version.properties - - maven-target: + - maven-set-release-version: maven-version: '{maven-version}' - goals: 'versions:set versions:update-child-modules versions:commit -B' - properties: - - 'newVersion=${{release_version}}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp + mvn-settings: '{mvn-settings}' + pom: - maven-target: maven-version: '{maven-version}' @@ -383,15 +373,10 @@ - inject: properties-file: version.properties - - maven-target: + - maven-set-release-version: maven-version: '{maven-version}' - goals: 'versions:set versions:update-child-modules versions:commit -B' - properties: - - 'newVersion=${{release_version}}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp + mvn-settings: '{mvn-settings}' + pom: - maven-target: maven-version: '{maven-version}' @@ -538,16 +523,10 @@ - inject: properties-file: version.properties - - maven-target: + - maven-set-release-version: maven-version: '{maven-version}' + mvn-settings: '{mvn-settings}' pom: '{pom}' - goals: 'versions:set versions:update-child-modules versions:commit -B' - properties: - - 'newVersion=${{release_version}}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - maven-target: maven-version: '{maven-version}' @@ -695,7 +674,7 @@ <<: *merge_java_defaults name: '{project-name}-{stream}-{subproject}-merge-java' -- job-template: +- job-template: &docker_java_defaults # Job template for Docker daily jobs # # The purpose of this job template is to run: @@ -773,65 +752,14 @@ # Required Variables: # branch: git branch (eg. stable/lithium or master) + <<: *docker_java_defaults name: '{project-name}-{stream}-docker-java-daily' id: docker-java-daily - project-type: freestyle node: '{build-node}' - disabled: '{disabled}' - properties: - - infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - maven-exec: - maven-version: '{maven-version}' - - maven-params: - mvn-params: '{mvn-params}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - wrappers: - infra-wrappers-docker-build: build-timeout: '{build-timeout}' - triggers: - # 12 AM UTC - - timed: 'H 12 * * *' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - - builders: - - - provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - - docker-login - - - maven-docker-push-daily: - maven-version: '{maven-version}' - mvn-settings: '{mvn-settings}' - pom: '{docker-pom}' - # use default as mvn-profile if profile is not needed - mvn-profile: '{mvn-profile}' - mvn-params: '{mvn-params}' - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - - - job-template: # Job template for building & pushing docker images # @@ -890,15 +818,10 @@ steps: - inject: properties-file: version.properties - - maven-target: + - maven-set-release-version: maven-version: '{maven-version}' - goals: 'versions:set versions:update-child-modules versions:commit -B' - properties: - - 'newVersion=${{release_version}}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp + mvn-settings: '{mvn-settings}' + pom: - docker-login - maven-docker-push-daily: maven-version: '{maven-version}' @@ -1104,16 +1027,10 @@ - inject: properties-file: version.properties - - - maven-target: + - maven-set-release-version: maven-version: '{maven-version}' - goals: 'versions:set versions:update-child-modules versions:commit -B' - properties: - - 'newVersion=${{release_version}}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp + mvn-settings: '{mvn-settings}' + pom: - docker-login @@ -1188,17 +1105,10 @@ - inject: properties-file: version.properties - - - maven-target: + - maven-set-release-version: maven-version: '{maven-version}' + mvn-settings: '{mvn-settings}' pom: '{pom}' - goals: 'versions:set versions:update-child-modules versions:commit -B' - properties: - - 'newVersion=${{release_version}}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - docker-login @@ -1217,7 +1127,7 @@ - infra-shiplogs: maven-version: '{maven-version}' -- job-template: +- job-template: &docker_version_java_defaults # Job template for building & pushing docker images # # The purpose of this job template is to run: @@ -1276,16 +1186,10 @@ - inject: properties-file: version.properties - - - maven-target: + - maven-set-release-version: maven-version: '{maven-version}' - goals: 'versions:set versions:update-child-modules versions:commit -B' - properties: - - 'newVersion=${{release_version}}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp + mvn-settings: '{mvn-settings}' + pom: - docker-login @@ -1314,162 +1218,14 @@ # profile: the docker profile defined in the pom # maven-properties: properties passed to maven + <<: *docker_version_java_defaults name: '{project-name}-{stream}-docker-version-java-daily' id: 'docker-version-java-daily' - project-type: freestyle node: '{build-node}' - disabled: '{disabled}' - properties: - - infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - maven-exec: - maven-version: '{maven-version}' - - maven-params: - mvn-params: '{mvn-params}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - wrappers: - infra-wrappers-docker-build: build-timeout: '{build-timeout}' - triggers: - # 12 AM UTC - - timed: 'H 12 * * *' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - - builders: - - - provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - - inject: - properties-file: version.properties - - - maven-target: - maven-version: '{maven-version}' - goals: 'versions:set versions:update-child-modules versions:commit -B' - properties: - - 'newVersion=${{release_version}}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - - docker-login - - - maven-docker-push-daily: - maven-version: '{maven-version}' - mvn-settings: '{mvn-settings}' - pom: '{docker-pom}' - # use default as mvn-profile if profile is not needed - mvn-profile: '{mvn-profile}' - mvn-params: '{mvn-params}' - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: - # Job template for building & pushing docker images - # - # The purpose of this job template is to run: - # 1. inject a version.properties file and set versions - # 2. login to the docker registry - # 3. run a docker push - # - # This job supports subprojects. - # - # Required Variables: - # pom: name/location of the pom.xml file relative to the workspace - # maven-properties: properties passed to maven - - name: '{project-name}-{stream}-{subproject}-docker-version-java-daily' - project-type: freestyle - node: 'ubuntu1604-docker-8c-8g' - disabled: '{disabled}' - properties: - - infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - maven-exec: - maven-version: '{maven-version}' - - maven-params: - mvn-params: '{mvn-params}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # 12 AM UTC - - timed: 'H 12 * * *' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - - builders: - - - provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - - inject: - properties-file: version.properties - - - maven-target: - maven-version: '{maven-version}' - pom: '{pom}' - goals: 'versions:set versions:update-child-modules versions:commit -B' - properties: - - 'newVersion=${{release_version}}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - - docker-login - - - maven-docker-push-daily: - maven-version: '{maven-version}' - mvn-settings: '{mvn-settings}' - pom: '{docker-pom}' - # use default as mvn-profile if profile is not needed - mvn-profile: '{mvn-profile}' - mvn-params: '{mvn-params}' - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - - job-template: # Job template for building & pushing docker images for AAI specific repos # @@ -1558,96 +1314,6 @@ maven-version: '{maven-version}' - job-template: - # Job template for building & pushing docker images for AAI specific repos - # - # The purpose of this job template is to run: - # 1. login to the docker registry - # 2. run maven goals - # 3. run include-docker-push.sh - # - # This job supports subprojects - # - # Required Variables: - # pom: name/location of the pom.xml file relative to the workspace - # maven-properties: properties passed to maven - - name: '{project-name}-{stream}-{subproject}-aai-docker-java-daily' - project-type: freestyle - node: 'ubuntu1604-docker-8c-8g' - disabled: '{disabled}' - docker-image-name: '' - - properties: - - infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - maven-exec: - maven-version: '{maven-version}' - - docker-image-name: - docker-image-name: '{docker-image-name}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # 12 AM UTC - - timed: 'H 12 * * *' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - - builders: - - - provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - - docker-login - - - maven-target: - maven-version: '{maven-version}' - pom: 'pom.xml' - goals: 'clean install -DskipTests -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - - maven-target: - maven-version: '{maven-version}' - pom: '{pom}' - goals: '{mvn-goals}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - properties: - - maven.test.skip=true - - docker.pull.registry=nexus3.onap.org:10001 - - docker.push.registry=nexus3.onap.org:10003 - - - shell: !include-raw-escape: include-docker-push.sh - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: # Job template for Java merge jobs for SDC specific repos # # The purpose of this job template is to run: @@ -1676,85 +1342,3 @@ # use default as mvn-profile if profile is not needed mvn-profile: '{mvn-profile}' mvn-params: '' - -- job-template: - # Job template for building & pushing docker images for AAI specific repos - # - # The purpose of this job template is to run: - # 1. login to the docker registry - # 2. run maven clean install goals skipping tests - # 3. run maven goals - # - # Required Variables: - # pom: name/location of the pom.xml file relative to the workspace - # maven-properties: properties passed to maven - - name: '{project-name}-{stream}-aai-docker-java-version-daily' - project-type: freestyle - node: 'ubuntu1604-docker-8c-8g' - disabled: '{disabled}' - properties: - - infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - maven-exec: - maven-version: '{maven-version}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # 12 AM UTC - - timed: 'H 12 * * *' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - - builders: - - - provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - - docker-login - - - maven-target: - maven-version: '{maven-version}' - pom: 'pom.xml' - goals: 'clean install -DskipTests -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - - maven-target: - maven-version: '{maven-version}' - pom: '{pom}' - goals: '{mvn-goals}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - properties: - - maven.test.skip=true - - docker.pull.registry=nexus3.onap.org:10001 - - docker.push.registry=nexus3.onap.org:10003 - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml index d2a10f8ab..99404034d 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml @@ -7,6 +7,10 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' project: logging-analytics/pomba/pomba-aai-context-builder stream: - 'master': diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml index 8361fd61a..e0eae9c8e 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml @@ -9,6 +9,7 @@ - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily': docker-pom: 'pom.xml' + mvn-goals: 'docker:build' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' project: logging-analytics/pomba/pomba-context-aggregator diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml index 0b87b8fa2..34d161f08 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml @@ -7,6 +7,10 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' project: logging-analytics/pomba/pomba-network-discovery-context-builder stream: - 'master': diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml index f9822f247..20acd63fd 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml @@ -7,6 +7,10 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' project: logging-analytics/pomba/pomba-sdc-context-builder stream: - 'master': diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml index b0eab1f19..3c48c662d 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml @@ -7,6 +7,10 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' project: logging-analytics/pomba/pomba-sdnc-context-builder stream: - 'master': diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml new file mode 100644 index 000000000..003a74335 --- /dev/null +++ b/jjb/oom/oom-helm.yaml @@ -0,0 +1,83 @@ +--- +- project: + name: oom + project-name: oom + project: oom + mvn-settings: oom-settings + archive-artifacts: '' + build-node: ubuntu1604-helm-2c-1g + pre_build_script: !include-raw-escape: shell/helm-repo-init.sh + stream: + - 'master': + branch: 'master' + + subproject: + - 'aaf': + files: 'kubernetes/aaf/**' + - 'aai': + files: 'kubernetes/aai/**' + - 'appc': + files: 'kubernetes/appc/**' + - 'clamp': + files: 'kubernetes/clamp/**' + - 'cli': + files: 'kubernetes/cli/**' + - 'common': + files: 'kubernetes/common/**' + - 'consul': + files: 'kubernetes/consul/**' + - 'dcaegen2': + files: 'kubernetes/dcaegen2/**' + - 'dmaap': + files: 'kubernetes/dmaap/**' + - 'esr': + files: 'kubernetes/esr/**' + - 'log': + files: 'kubernetes/log/**' + - 'msb': + files: 'kubernetes/msb/**' + - 'multicloud': + files: 'kubernetes/multicloud/**' + - 'nbi': + files: 'kubernetes/nbi/**' + - 'oof': + files: 'kubernetes/oof/**' + - 'policy': + files: 'kubernetes/policy/**' + - 'portal': + files: 'kubernetes/portal/**' + - 'readiness': + files: 'kubernetes/readiness/**' + - 'robot': + files: 'kubernetes/robot/**' + - 'sdc': + files: 'kubernetes/sdc/**' + - 'sdnc': + files: 'kubernetes/sdnc/**' + - 'sniro-emulator': + files: 'kubernetes/sniro-emulator/**' + - 'so': + files: 'kubernetes/so/**' + - 'uui': + files: 'kubernetes/uui/**' + - 'vfc': + files: 'kubernetes/vfc/**' + - 'vid': + files: 'kubernetes/vid/**' + - 'vnfsdk': + files: 'kubernetes/vnfsdk/**' + + jobs: + - '{project-name}-{stream}-verify-helm': + build_script: 'cd kubernetes/ && make all' + files: '**' + - '{project-name}-{stream}-merge-helm': + build_script: 'cd kubernetes/ && make all' + files: '**' + - '{project-name}-{subproject}-{stream}-verify-helm': + build_script: 'cd kubernetes/ && make {subproject}' + - '{project-name}-{subproject}-{stream}-merge-helm': + build_script: 'cd kubernetes/ && make {subproject}' + - '{project-name}-{stream}-update-helm-weekly': + files: '**' + build_script: 'cd kubernetes/ && make all' diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index ffca9ef94..2301524e7 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -47,6 +47,7 @@ mvn-params: '-Dmaven.test.skip=true' script: !include-raw-escape: 'build-optf-has-docker-image.sh' + build-node: queue-docker-4c-4g - '{project-name}-{stream}-{subproject}-docker-java-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index cc4ce9031..4c98b320d 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -46,6 +46,7 @@ mvn-params: '-Dmaven.test.skip=true' script: !include-raw-escape: 'build-optf-osdf-docker-image.sh' + build-node: queue-docker-4c-4g - '{project-name}-{stream}-{subproject}-docker-java-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/shell/helm-repo-init.sh b/shell/helm-repo-init.sh new file mode 100644 index 000000000..fb2f81029 --- /dev/null +++ b/shell/helm-repo-init.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# Ensure we fail the job if any steps fail +set -e -o pipefail + +# client only init, tiller will not be installed +helm init --client-only +cd kubernetes/ || exit +make repo +cd .. |