diff options
17 files changed, 195 insertions, 7 deletions
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index 960bf6bf2..e877b52dd 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -12,6 +12,7 @@ settings: '{mvn-settings}' script: !include-raw-escape: 'build-aaf-docker-image.sh' + build-node: 'ubuntu1604-docker-8c-8g' project: 'aaf/authz' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml index 65cba2b41..8ac744a79 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -11,6 +11,7 @@ mvn-goals: 'clean package docker:build -DpushImage' # No-op script: '/bin/true' + build-node: 'ubuntu1604-docker-8c-8g' project: 'dcaegen2/platform/inventory-api' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index 33fcb1151..7c66bfdc8 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -11,6 +11,7 @@ mvn-goals: 'clean package docker:build -DpushImage' # No-op script: '/bin/true' + build-node: 'ubuntu1604-docker-8c-8g' project: 'dcaegen2/platform/servicechange-handler' stream: diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index aed61875c..322c07973 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -11,6 +11,7 @@ mvn-goals: 'clean package docker:build -DpushImage' # No-op script: '/bin/true' + build-node: 'ubuntu1604-docker-8c-8g' project: 'dcaegen2/services/mapper' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index ad1fa4ac2..b555fd87d 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -11,6 +11,7 @@ mvn-goals: 'clean package docker:build -DpushImage' # No-op script: '/bin/true' + build-node: 'ubuntu1604-docker-8c-8g' project: 'dcaegen2/services/prh' stream: diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 89e635e94..2af0e8d96 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -16,6 +16,7 @@ mvn-goals: 'clean package -P docker docker:build -DpushImage' # No-op script: '/bin/true' + build-node: 'ubuntu1604-docker-8c-8g' project: 'dmaap/buscontroller' stream: diff --git a/jjb/dmaap/dmaap-datarouter-csit.yaml b/jjb/dmaap/dmaap-datarouter-csit.yaml new file mode 100644 index 000000000..d6c4765d7 --- /dev/null +++ b/jjb/dmaap/dmaap-datarouter-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: dmaap-datarouter-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dmaap-datarouter' + stream: 'master' + functionality: + - 'dr-suite': + trigger_jobs: + - '{project-name}-{stream}-docker-java-shell-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index c61122c20..da0088dea 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -14,6 +14,7 @@ mvn-goals: 'clean package -P docker docker:build -DpushImage' # No-op script: '/bin/true' + build-node: 'ubuntu1604-docker-8c-8g' project: 'dmaap/datarouter' stream: diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 29a5c290f..f3bd189ae 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -925,7 +925,75 @@ name: '{project-name}-{stream}-docker-java-shell-daily' project-type: freestyle - node: 'ubuntu1604-docker-8c-8g' + 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}' + + 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}' + goals: '{mvn-goals}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + + - shell: '{script}' + + 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. login to the docker registry + # 2. run a specified shell builder + # + # 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-java-shell-daily' + project-type: freestyle + node: '{build-node}' disabled: '{disabled}' properties: - infra-properties: @@ -968,6 +1036,7 @@ - maven-target: maven-version: '{maven-version}' + pom: '{pom}' goals: '{mvn-goals}' settings: '{mvn-settings}' settings-type: cfp 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 534c99549..8361fd61a 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.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-context-aggregator stream: - 'master': 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/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 60e984e1d..ffca9ef94 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -21,14 +21,39 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-builder-4c-4g' + +- project: + name: optf-has-docker + project-name: 'optf-has' + project: 'optf/has' + stream: + - 'master': + branch: 'master' + - 'beijing': + branch: 'beijing' + mvn-settings: 'optf-has-settings' + subproject: + - 'conductor': + path: 'conductor' + pattern: 'conductor/**' + pom: 'pom.xml' + jobs: - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' + mvn-params: '-Dmaven.test.skip=true' script: !include-raw-escape: 'build-optf-has-docker-image.sh' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' + - '{project-name}-{stream}-{subproject}-docker-java-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + mvn-params: '-Dmaven.test.skip=true' + script: + !include-raw-escape: 'build-optf-has-docker-image.sh' + build-node: queue-docker-4c-4g - project: name: optf-has-sonar diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 23d41445a..cc4ce9031 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -20,14 +20,39 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-builder-4c-4g' + +- project: + name: optf-osdf-docker + project-name: 'optf-osdf' + project: 'optf/osdf' + stream: + - 'master': + branch: 'master' + - 'beijing': + branch: 'beijing' + mvn-settings: 'optf-osdf-settings' + subproject: + - 'osdf': + path: '.' + pattern: '**' + pom: 'pom.xml' + jobs: - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' + mvn-params: '-Dmaven.test.skip=true' script: !include-raw-escape: 'build-optf-osdf-docker-image.sh' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' + - '{project-name}-{stream}-{subproject}-docker-java-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + mvn-params: '-Dmaven.test.skip=true' + script: + !include-raw-escape: 'build-optf-osdf-docker-image.sh' + build-node: queue-docker-4c-4g - project: name: optf-osdf-sonar diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index 6de720cad..31369b99d 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -32,3 +32,31 @@ - name: 'Add golang to PATH' command: 'echo "export PATH=$PATH:/usr/local/go/bin" >> /etc/profile' become: true + + - name: Install libxml2-utils + apt: + name: libxml2-utils + state: present + become: true + + - name: Add Google Chrome key + apt-key: + url: https://dl-ssl.google.com/linux/linux_signing_key.pub + state: present + become: true + + - name: Add Google Chrome repo + copy: content="deb http://dl.google.com/linux/chrome/deb/ stable main" dest={{apt_file}} owner=root group=root mode=644 + when: google_apt_exists.rc == 1 + become: true + + - name: Update apt cache + apt: update_cache=yes + when: google_apt_exists.rc == 1 + become: true + + - name: Install Google Chrome + apt: + name: pkg=google-chrome-stable state=installed + state: installed + become: true |