diff options
-rw-r--r-- | jjb/aai/aai-aai-service.yaml | 15 | ||||
-rw-r--r-- | jjb/aai/aai-logging-service.yaml | 15 | ||||
-rw-r--r-- | jjb/aai/aai-model-loader.yaml | 15 | ||||
-rw-r--r-- | jjb/appc/appc-deployment.yaml | 16 | ||||
-rw-r--r-- | jjb/appc/appc.yaml | 16 | ||||
-rw-r--r-- | jjb/ci-management/ci-management.yaml | 4 | ||||
-rw-r--r-- | jjb/dcae/dcae-inventory.yaml | 16 | ||||
-rw-r--r-- | jjb/demo/demo.yaml | 16 | ||||
-rw-r--r-- | jjb/global-macros.yaml | 38 | ||||
-rw-r--r-- | jjb/global-templates-java.yaml | 41 | ||||
-rw-r--r-- | jjb/global-templates-python.yaml | 3 | ||||
-rw-r--r-- | jjb/include-docker-login.sh | 26 | ||||
-rw-r--r-- | jjb/mso/mso.yaml | 3 | ||||
-rw-r--r-- | jjb/ncomp/ncomp-maven.yaml | 21 | ||||
-rw-r--r-- | jjb/policy/policy-common.yaml | 16 | ||||
-rw-r--r-- | jjb/policy/policy-drools-applications.yaml | 16 | ||||
-rw-r--r-- | jjb/policy/policy-drools-pdp.yaml | 16 | ||||
-rw-r--r-- | jjb/policy/policy-engine.yaml | 16 | ||||
-rw-r--r-- | jjb/sdc/sdc-sdc-distribution-client.yaml | 16 | ||||
-rw-r--r-- | jjb/sdc/sdc-sdc_common.yaml | 16 | ||||
-rw-r--r-- | jjb/sdc/sdc.yaml | 16 | ||||
-rw-r--r-- | packer/provision/baseline.sh | 20 |
22 files changed, 372 insertions, 5 deletions
diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml new file mode 100644 index 000000000..f95e79c6c --- /dev/null +++ b/jjb/aai/aai-aai-service.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: aai-aai-service + project-name: 'aai-aai-service' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + + project: 'aai/aai-service' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aai-aai-service-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml new file mode 100644 index 000000000..54a883366 --- /dev/null +++ b/jjb/aai/aai-logging-service.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: aai-logging-service + project-name: 'aai-logging-service' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-java-daily' + project: 'aai/logging-service' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aai-logging-service-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml new file mode 100644 index 000000000..0337c4dcc --- /dev/null +++ b/jjb/aai/aai-model-loader.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: aai-model-loader + project-name: 'aai-model-loader' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-java-daily' + project: 'aai/model-loader' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aai-model-loader-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml new file mode 100644 index 000000000..fdc48b63a --- /dev/null +++ b/jjb/appc/appc-deployment.yaml @@ -0,0 +1,16 @@ +--- + +- project: + name: appc-deployment + project-name: 'appc-deployment' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + + project: 'appc/deployment' + stream: + - 'master': + branch: 'master' + mvn-settings: 'appc-deployment-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/appc/appc.yaml b/jjb/appc/appc.yaml new file mode 100644 index 000000000..b03a9b741 --- /dev/null +++ b/jjb/appc/appc.yaml @@ -0,0 +1,16 @@ +--- + +- project: + name: appc + project-name: 'appc' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + + project: 'appc' + stream: + - 'master': + branch: 'master' + mvn-settings: 'appc-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index 8a6d7e473..662e9c542 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -22,8 +22,8 @@ - docker exclude: - # only build the docker image on centos at present - - platforms: ubuntu-16.04 + # only build the docker image on ubuntu at present + - platforms: centos templates: docker - job-template: diff --git a/jjb/dcae/dcae-inventory.yaml b/jjb/dcae/dcae-inventory.yaml new file mode 100644 index 000000000..b7e275918 --- /dev/null +++ b/jjb/dcae/dcae-inventory.yaml @@ -0,0 +1,16 @@ +--- + +- project: + name: dcae-inventory + project-name: 'dcae-inventory' + jobs: + - '{project-name}-{stream}-verify-java' + + project: 'dcae/dcae-inventory' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcae-dcae-inventory-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml new file mode 100644 index 000000000..47fa0a8ce --- /dev/null +++ b/jjb/demo/demo.yaml @@ -0,0 +1,16 @@ +--- + +- project: + name: demo + project-name: 'demo' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + + project: 'demo' + stream: + - 'master': + branch: 'master' + mvn-settings: 'demo-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index a9681033f..5815ccf53 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -20,6 +20,43 @@ - file-id: '{settings-file}' variable: 'SETTINGS_FILE' +- builder: + name: maven-docker-push-release + builders: + - maven-target: + maven-version: 'mvn33' + pom: '{pom}' + goals: 'clean deploy -B' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + properties: + - maven.test.skip=true + - docker.pull.registry=nexus3.openecomp.org:10001 + - docker.push.registry=nexus3.openecomp.org:10002 + +- builder: + name: maven-docker-push-daily + builders: + - maven-target: + maven-version: 'mvn33' + pom: '{pom}' + goals: 'clean deploy -B' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + properties: + - maven.test.skip=true + - docker.pull.registry=nexus3.openecomp.org:10001 + - docker.push.registry=nexus3.openecomp.org:10003 + +- builder: + name: docker-login + builders: + - shell: !include-raw: include-docker-login.sh + # PARAMETERS - parameter: name: ecomp-infra-parameters @@ -221,7 +258,6 @@ wipe-workspace: false basedir: '{checkout-dir}' - # TRIGGERS # This is a single macro to use for all jobs who vote on every (relevant) patch diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 039bc2ee1..af595b3b9 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -303,3 +303,44 @@ # publishers: # - ecomp-infra-shiplogs: # maven-version: 'mvn33' + +- job-template: + name: '{project-name}-{stream}-docker-java-daily' + project-type: freestyle + node: 'ubuntu1604-docker-8c-8g' + + properties: + - ecomp-infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - ecomp-infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + + wrappers: + - ecomp-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + # 11 AM UTC + - timed: 'H 12 * * *' + + builders: + + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + + - docker-login + + - maven-docker-push-daily: + mvn-settings: '{mvn-settings}' + pom: '{docker-pom}' diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index f0663bc1f..7404b7e74 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -48,6 +48,9 @@ files: '{pattern}' builders: + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' - shell: | virtualenv $WORKSPACE/venv-tox source $WORKSPACE/venv-tox/bin/activate diff --git a/jjb/include-docker-login.sh b/jjb/include-docker-login.sh new file mode 100644 index 000000000..3b677b46d --- /dev/null +++ b/jjb/include-docker-login.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +DOCKER_REPOSITORIES="nexus3.openecomp.org:10001 \ + nexus3.openecomp.org:10002 \ + nexus3.openecomp.org:10003" + +for DOCKER_REPOSITORY in $DOCKER_REPOSITORIES; +do + echo $DOCKER_REPOSITORY + USER=$(xpath -e "//servers/server[id='$DOCKER_REPOSITORY']/username/text()" "$SETTINGS_FILE") + PASS=$(xpath -e "//servers/server[id='$DOCKER_REPOSITORY']/password/text()" "$SETTINGS_FILE") + + if [ -z "$USER" ]; + then + echo "Error: no user provided" + fi + + if [ -z "$PASS" ]; + then + echo "Error: no password provided" + fi + + [ -z "$PASS" ] && PASS_PROVIDED="<empty>" || PASS_PROVIDED="<password>" + echo docker login $DOCKER_REPOSITORY -u "$USER" -p "$PASS_PROVIDED" + docker login $DOCKER_REPOSITORY -u "$USER" -p "$PASS" +done diff --git a/jjb/mso/mso.yaml b/jjb/mso/mso.yaml index c007b0097..060df18ff 100644 --- a/jjb/mso/mso.yaml +++ b/jjb/mso/mso.yaml @@ -1,4 +1,5 @@ --- + - project: name: mso project-name: 'mso' @@ -6,6 +7,8 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-docker-java-daily': + docker-pom: './packages/docker/pom.xml' project: 'mso' stream: diff --git a/jjb/ncomp/ncomp-maven.yaml b/jjb/ncomp/ncomp-maven.yaml new file mode 100644 index 000000000..9a1d2ad62 --- /dev/null +++ b/jjb/ncomp/ncomp-maven.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: ncomp-maven + project-name: 'ncomp-maven' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-java-daily' + + project: 'ncomp/maven' + stream: + - 'master': + branch: 'master' + mvn-settings: 'ncomp-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/policy/policy-common.yaml b/jjb/policy/policy-common.yaml new file mode 100644 index 000000000..ac5d92186 --- /dev/null +++ b/jjb/policy/policy-common.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: policy-common + project-name: 'policy-common' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-java-daily' + + project: 'policy/common' + stream: + - 'master': + branch: 'master' + mvn-settings: 'policy-common-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml new file mode 100644 index 000000000..4af3bf217 --- /dev/null +++ b/jjb/policy/policy-drools-applications.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: policy-drools-applications + project-name: 'policy-drools-applications' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-java-daily' + + project: 'policy/drools-applications' + stream: + - 'master': + branch: 'master' + mvn-settings: 'policy-drools-applications-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml new file mode 100644 index 000000000..3ea404a34 --- /dev/null +++ b/jjb/policy/policy-drools-pdp.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: policy-drools-pdp + project-name: 'policy-drools-pdp' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-java-daily' + + project: 'policy/drools-pdp' + stream: + - 'master': + branch: 'master' + mvn-settings: 'policy-drools-pdp-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml new file mode 100644 index 000000000..920e7f991 --- /dev/null +++ b/jjb/policy/policy-engine.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: policy-engine + project-name: 'policy-engine' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-java-daily' + + project: 'policy/engine' + stream: + - 'master': + branch: 'master' + mvn-settings: 'policy-engine-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml new file mode 100644 index 000000000..0e7ce3657 --- /dev/null +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -0,0 +1,16 @@ +--- + +- project: + name: sdc-sdc-distribution-client + project-name: 'sdc-sdc-distribution-client' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + + project: 'sdc/sdc-distribution-client' + stream: + - 'master': + branch: 'master' + mvn-settings: 'sdc-sdc-distribution-client-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc_common.yaml b/jjb/sdc/sdc-sdc_common.yaml new file mode 100644 index 000000000..a29eb316e --- /dev/null +++ b/jjb/sdc/sdc-sdc_common.yaml @@ -0,0 +1,16 @@ +--- + +- project: + name: sdc-sdc_common + project-name: 'sdc-sdc_common' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + + project: 'sdc/sdc_common' + stream: + - 'master': + branch: 'master' + mvn-settings: 'sdc-sdc_common-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml new file mode 100644 index 000000000..ade674a6f --- /dev/null +++ b/jjb/sdc/sdc.yaml @@ -0,0 +1,16 @@ +--- + +- project: + name: sdc + project-name: 'sdc' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + + project: 'sdc' + stream: + - 'master': + branch: 'master' + mvn-settings: 'sdc-settings' + files: '**' + archive-artifacts: '' diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh index 68a16226f..ca79868aa 100644 --- a/packer/provision/baseline.sh +++ b/packer/provision/baseline.sh @@ -115,6 +115,8 @@ Dpkg::Options { EOF + chmod +x /usr/local/bin/apt-get + echo "---> Updating operating system" apt-get update apt-get upgrade @@ -137,9 +139,23 @@ EOF # make sure that we still default to openjdk 7 update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java update-alternatives --set javac /usr/lib/jvm/java-7-openjdk-amd64/bin/javac + + # disable auto-update service? + if [ -f /etc/cron.daily/apt ] + then + rm -rf /etc/cron.daily/apt + fi ;; 16.04) apt-get install openjdk-8-jdk + + # force auto-update services off and mask them so they can't + # be started + for i in apt-daily.{service,timer} + do + systemctl disable ${i} + systemctl mask ${i} + done ;; *) echo "---> Unknown Ubuntu version $FACTER_OSVER" @@ -155,8 +171,8 @@ EOF # disable unattended upgrades & daily updates echo '---> Disabling automatic daily upgrades' - sed -ine 's/"1"/"0"/g' /etc/apt/apt.conf.d/10periodic - echo 'APT::Periodic::Unattended-Upgrade "0";' >> /etc/apt/apt.conf.d/10periodic + grep -lR 'APT::Periodic' /etc/apt/apt.conf.d/ | perl -pi -e 's/"1"/"0"/g' + } all_systems() { |