diff options
| -rw-r--r-- | jjb/clamp/clamp.yaml | 5 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 62 | ||||
| -rw-r--r-- | jjb/so/so-csit.yaml | 14 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml (renamed from jjb/vfc/vfc-driver-svnfm-python.yaml) | 6 | ||||
| -rw-r--r-- | packer/provision/redis.sh | 57 | ||||
| -rw-r--r-- | packer/templates/redis.json | 54 |
6 files changed, 194 insertions, 4 deletions
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index 9070da0b6..1004a2c9c 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -5,7 +5,10 @@ project-name: 'clamp' jobs: - '{project-name}-{stream}-verify-java-checkstyle' - - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-merge-properties-java': + maven-properties: | + docker.pull.registry=nexus3.onap.org:10001 + docker.push.registry=nexus3.onap.org:10003 - '{project-name}-{stream}-release-java-daily-checkstyle': maven-deploy-properties: | skipDockerBuild diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 580d65b36..c5803dcb8 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -771,6 +771,68 @@ maven-version: '{maven-version}' - job-template: + # Job template for Java merge jobs based on + # '{project-name}-{stream}-merge-java' + # The purpose of this job template is to run "maven clean deploy" for + # projects using this template. + # + # Required Variables: + # branch: git branch (eg. stable/lithium or master) + # maven-properties: properties passed to maven + name: '{project-name}-{stream}-merge-properties-java' + + project-type: freestyle + node: '{build-node}' + + 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: + - gerrit-trigger-patch-merged: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '**' + + builders: + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + - maven-target: + maven-version: '{maven-version}' + goals: 'clean deploy -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 + properties: '{maven-properties}' + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + +- job-template: # Job template for Java merge jobs that takes a maven template # # The purpose of this job template is to run "maven clean deploy -P {x}" diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml new file mode 100644 index 000000000..566356652 --- /dev/null +++ b/jjb/so/so-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: so-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'so' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: + - 'so-master-docker-version-java-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/vfc/vfc-driver-svnfm-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml index 8c0077622..603902b3f 100644 --- a/jjb/vfc/vfc-driver-svnfm-python.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml @@ -1,15 +1,15 @@ --- - project: - name: vfc-nfvo-driver-svnfm - project-name: 'vfc-nfvo-driver-svnfm' + name: vfc-nfvo-driver-vnfm-svnfm-zte-python + project-name: 'vfc-nfvo-driver-vnfm-svnfm' project: 'vfc/nfvo/driver/vnfm/svnfm' stream: - 'master': branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' - mvn-settings: 'vfc-nfvo-driver-svnfm-settings' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' build-node: ubuntu1604-basebuild-4c-4g subproject: - 'drv-vnfm-zte': diff --git a/packer/provision/redis.sh b/packer/provision/redis.sh new file mode 100644 index 000000000..11e2177a1 --- /dev/null +++ b/packer/provision/redis.sh @@ -0,0 +1,57 @@ +#!/bin/bash +# This particular environment was created specifically for vfc-nfvo-lcm + +# vim: ts=4 sw=4 sts=4 et tw=72 : + +# force any errors to cause the script and job to end in failure +set -xeu -o pipefail + +rh_systems() { + # redis + yum install redis + systemctl enable redis.service +} + +ubuntu_systems() { + # redis + + # 1. download and install redis + cd /tmp + wget http://download.redis.io/releases/redis-4.0.1.tar.gz + tar -zxf redis-4.0.1.tar.gz + cd /tmp/redis-4.0.1 + make + make install + + # 2. set conf file and init script + mv /tmp/redis-4.0.1/redis-server /etc/init.d/redis-server + chmod +x /etc/init.d/redis-server + mv /tmp/redis-4.0.1/redis.conf /etc/redis.conf + + # 3. set auto start when start system + update-rc.d redis-server defaults +} + +all_systems() { + echo 'No common distribution configuration to perform' +} + +echo "---> Detecting OS" +ORIGIN=$(facter operatingsystem | tr '[:upper:]' '[:lower:]') + +case "${ORIGIN}" in + fedora|centos|redhat) + echo "---> RH type system detected" + rh_systems + ;; + ubuntu) + echo "---> Ubuntu system detected" + ubuntu_systems + ;; + *) + echo "---> Unknown operating system" + ;; +esac + +# execute steps for all systems +all_systems diff --git a/packer/templates/redis.json b/packer/templates/redis.json new file mode 100644 index 000000000..7dee6fa3e --- /dev/null +++ b/packer/templates/redis.json @@ -0,0 +1,54 @@ +{ + "variables": { + "stack_tenant": null, + "stack_user": null, + "stack_pass": null, + "stack_network": null, + "base_image": null, + "cloud_user": null, + "distro": null, + "cloud_user_data": null + }, + "builders": [ + { + "type": "openstack", + "identity_endpoint": "https://auth.vexxhost.net/v2.0/", + "tenant_name": "{{user `stack_tenant`}}", + "username": "{{user `stack_user`}}", + "password": "{{user `stack_pass`}}", + "region": "ca-ymq-1", + "ssh_username": "{{user `cloud_user`}}", + "image_name": "{{user `distro`}} - redis - {{isotime \"20060102-1504\"}}", + "source_image_name": "{{user `base_image`}}", + "flavor": "v1-standard-1", + "availability_zone": "ca-ymq-2", + "networks": [ + "{{user `stack_network`}}" + ], + "user_data_file": "{{user `cloud_user_data`}}" + } + ], + "provisioners": [ + { + "type": "shell", + "inline": [ + "mkdir -p /tmp/packer" + ] + }, + { + "type": "file", + "source": "provision/basebuild/", + "destination": "/tmp/packer" + }, + { + "type": "shell", + "scripts": [ + "provision/baseline.sh", + "provision/basebuild.sh", + "provision/redis.sh", + "provision/system_reseal.sh" + ], + "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi" + } + ] +} |