diff options
| -rw-r--r-- | jjb/cli/cli.yaml | 9 | ||||
| -rw-r--r-- | jjb/multicloud/multicloud-openstack-vmware-java.yaml | 19 | ||||
| -rw-r--r-- | jjb/multicloud/multicloud-openstack-vmware-python.yaml | 16 | ||||
| -rw-r--r-- | jjb/portal/portal-sdk.yaml | 1 | ||||
| -rw-r--r-- | packer/provision/redis.sh | 6 |
5 files changed, 46 insertions, 5 deletions
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 66e707b35..d7685b963 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -11,13 +11,18 @@ - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + maven-properties: | + skip.docker.build=false + skip.docker.tag=false + skip.docker.push=false project: 'cli' stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'cli-settings' files: '**' archive-artifacts: '' diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml new file mode 100644 index 000000000..d60aba345 --- /dev/null +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -0,0 +1,19 @@ +--- +- project: + name: multicloud-openstack-vmware-java + project-name: 'multicloud-openstack-vmware' + project: 'multicloud/openstack/vmware' + stream: + - 'master': + branch: 'master' + mvn-settings: 'multicloud-openstack-vmware-settings' + subproject: + - 'vio': + pom: 'vio/pom.xml' + pattern: 'vio/**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/multicloud/multicloud-openstack-vmware-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-python.yaml new file mode 100644 index 000000000..62e52f244 --- /dev/null +++ b/jjb/multicloud/multicloud-openstack-vmware-python.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: multicloud-openstack-vmware-python + project-name: 'multicloud-openstack-vmware' + project: 'multicloud/openstack/vmware' + stream: + - 'master': + branch: 'master' + mvn-settings: 'multicloud-openstack-vmware-settings' + build-node: 'ubuntu1604-basebuild-4c-4g' + subproject: + - 'vio': + path: 'vio' + pattern: 'vio/**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' diff --git a/jjb/portal/portal-sdk.yaml b/jjb/portal/portal-sdk.yaml index 24935b16d..6839543ce 100644 --- a/jjb/portal/portal-sdk.yaml +++ b/jjb/portal/portal-sdk.yaml @@ -22,3 +22,4 @@ mvn-settings: 'portal-sdk-settings' files: '**' archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/packer/provision/redis.sh b/packer/provision/redis.sh index 11e2177a1..c940c0ac8 100644 --- a/packer/provision/redis.sh +++ b/packer/provision/redis.sh @@ -8,7 +8,7 @@ set -xeu -o pipefail rh_systems() { # redis - yum install redis + yum install -y redis systemctl enable redis.service } @@ -24,9 +24,9 @@ ubuntu_systems() { make install # 2. set conf file and init script - mv /tmp/redis-4.0.1/redis-server /etc/init.d/redis-server + cp /tmp/redis-4.0.1/src/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 + cp /tmp/redis-4.0.1/redis.conf /etc/redis.conf # 3. set auto start when start system update-rc.d redis-server defaults |