summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/dcae/apod-analytics.yaml8
-rw-r--r--jjb/dcae/apod-cdap.yaml2
-rw-r--r--jjb/dcae/dmaapbc.yaml36
-rwxr-xr-xjjb/dcae/script-apod-analytics-daily-release.sh4
-rwxr-xr-xjjb/dcae/script-apod-analytics-merge.sh4
-rwxr-xr-xjjb/dcae/script-apod-analytics-verify.sh4
-rwxr-xr-xjjb/dcae/script-apod-cdap-daily-release.sh4
-rwxr-xr-xjjb/dcae/script-apod-cdap-merge.sh4
-rwxr-xr-xjjb/dcae/script-apod-cdap-verify.sh4
-rwxr-xr-xjjb/dcae/script-dmaapbc-daily-release.sh34
-rwxr-xr-xjjb/dcae/script-dmaapbc-merge.sh30
-rwxr-xr-xjjb/dcae/script-dmaapbc-verify.sh19
-rw-r--r--jjb/global-templates-java.yaml12
-rw-r--r--jjb/global-templates-script.yaml77
-rw-r--r--jjb/policy/include-raw-docker.sh7
-rw-r--r--jjb/policy/policy-docker.yaml2
-rw-r--r--jjb/portal/docker-build-push.sh8
-rw-r--r--jjb/portal/portal-docker.yaml9
-rw-r--r--jjb/sdc/sdc.yaml8
-rw-r--r--jjb/vid/vid.yaml1
20 files changed, 246 insertions, 31 deletions
diff --git a/jjb/dcae/apod-analytics.yaml b/jjb/dcae/apod-analytics.yaml
index 8f7365c9a..887635f7d 100644
--- a/jjb/dcae/apod-analytics.yaml
+++ b/jjb/dcae/apod-analytics.yaml
@@ -21,7 +21,7 @@
checkout-dir: 'dcae-apod-buildtools'
jobs:
- - '{project-name}-{stream}-daily-release-scm-mvn-script':
+ - '{project-name}-{stream}-daily-release-2scm-mvn-script':
mvn-goals-versioning:
'versions:set versions:update-child-modules versions:commit'
mvn-goals: 'clean deploy'
@@ -29,11 +29,11 @@
deployAtEnd=true
script:
!include-raw-escape: 'script-apod-analytics-daily-release.sh'
- - '{project-name}-{stream}-merge-scm-mvn-script':
- mvn-goals: 'clean deploy'
+ - '{project-name}-{stream}-verify-2scm-mvn-script':
+ mvn-goals: 'clean install'
script:
!include-raw-escape: 'script-apod-analytics-merge.sh'
- - '{project-name}-{stream}-verify-scm-mvn-script':
+ - '{project-name}-{stream}-merge-2scm-mvn-script':
mvn-goals: 'clean install'
script:
!include-raw-escape: 'script-apod-analytics-verify.sh'
diff --git a/jjb/dcae/apod-cdap.yaml b/jjb/dcae/apod-cdap.yaml
index 2a2d65fa8..76563afcc 100644
--- a/jjb/dcae/apod-cdap.yaml
+++ b/jjb/dcae/apod-cdap.yaml
@@ -11,7 +11,7 @@
mvn-settings: 'dcae-apod-cdap-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1604-basebuild-4c-4g
mvn-goals: '--version'
mvn-goals-versioning: '--version'
extra-project: 'dcae/apod/buildtools'
diff --git a/jjb/dcae/dmaapbc.yaml b/jjb/dcae/dmaapbc.yaml
new file mode 100644
index 000000000..dee2e9568
--- /dev/null
+++ b/jjb/dcae/dmaapbc.yaml
@@ -0,0 +1,36 @@
+---
+
+- project:
+ name: dcae-dmaapbc
+ # job template iterators
+ project-name: 'dcae-dmaapbc'
+ stream:
+ - 'master':
+ branch: 'master'
+ # apply to all jobs
+ project: 'dcae/dmaapbc'
+ mvn-settings: 'dcae-dmaapbc-settings'
+ # default to no op
+ mvn-goals: '--version'
+ # default to no op
+ mvn-goals-versioning: '--version'
+ files: '**'
+ archive-artifacts: ''
+
+ jobs:
+ - '{project-name}-{stream}-daily-release-scm-mvn-script':
+ mvn-goals-versioning:
+ 'versions:set versions:update-child-modules versions:commit'
+ mvn-goals: 'clean deploy'
+ maven-deploy-properties: |
+ deployAtEnd=true
+ script:
+ !include-raw-escape: 'script-dmaapbc-daily-release.sh'
+ - '{project-name}-{stream}-merge-scm-mvn-script':
+ mvn-goals: 'clean deploy'
+ script:
+ !include-raw-escape: 'script-dmaapbc-merge.sh'
+ - '{project-name}-{stream}-verify-scm-mvn-script':
+ mvn-goals: 'clean install'
+ script:
+ !include-raw-escape: 'script-dmaapbc-verify.sh'
diff --git a/jjb/dcae/script-apod-analytics-daily-release.sh b/jjb/dcae/script-apod-analytics-daily-release.sh
index f66980287..9b17374e9 100755
--- a/jjb/dcae/script-apod-analytics-daily-release.sh
+++ b/jjb/dcae/script-apod-analytics-daily-release.sh
@@ -78,11 +78,11 @@ cp ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${OUTPUT_DIR}/${OUTPUT_FILE}
echo 'Contents of output directory'
ls -lR ${OUTPUT_DIR}
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.analytics/deb-snapshots/${OUTPUT_FILE}"
echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE} to Nexus Repo: ${SEND_TO}"
curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE} ${SEND_TO}
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.analytics/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} to Nexus Repo: ${SEND_TO}"
curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${SEND_TO}
diff --git a/jjb/dcae/script-apod-analytics-merge.sh b/jjb/dcae/script-apod-analytics-merge.sh
index bc1b2377e..fedf54fa1 100755
--- a/jjb/dcae/script-apod-analytics-merge.sh
+++ b/jjb/dcae/script-apod-analytics-merge.sh
@@ -78,11 +78,11 @@ cp ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${OUTPUT_DIR}/${OUTPUT_FILE}
echo 'Contents of output directory'
ls -lR ${OUTPUT_DIR}
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.analytics/deb-snapshots/${OUTPUT_FILE}"
echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE} to Nexus Repo: ${SEND_TO}"
curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE} ${SEND_TO}
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.analytics/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} to Nexus Repo: ${SEND_TO}"
curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${SEND_TO}
diff --git a/jjb/dcae/script-apod-analytics-verify.sh b/jjb/dcae/script-apod-analytics-verify.sh
index 4d525d577..e12dfa493 100755
--- a/jjb/dcae/script-apod-analytics-verify.sh
+++ b/jjb/dcae/script-apod-analytics-verify.sh
@@ -78,11 +78,11 @@ cp ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${OUTPUT_DIR}/${OUTPUT_FILE}
echo 'Contents of output directory'
ls -lR ${OUTPUT_DIR}
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.analytics/deb-snapshots/${OUTPUT_FILE}"
echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE} to Nexus Repo: ${SEND_TO}"
curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE} ${SEND_TO}
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.analytics/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} to Nexus Repo: ${SEND_TO}"
curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${SEND_TO}
diff --git a/jjb/dcae/script-apod-cdap-daily-release.sh b/jjb/dcae/script-apod-cdap-daily-release.sh
index 23d32eb4b..045baa190 100755
--- a/jjb/dcae/script-apod-cdap-daily-release.sh
+++ b/jjb/dcae/script-apod-cdap-daily-release.sh
@@ -75,11 +75,11 @@ cp ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${OUTPUT_DIR}/${OUTPUT_FILE}
echo "Contents of output directory"
ls -lR ${OUTPUT_DIR}
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE}"
echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE} to Nexus: ${SEND_TO}"
curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE} ${SEND_TO}
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} to Nexus: ${SEND_TO}"
curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${SEND_TO}
diff --git a/jjb/dcae/script-apod-cdap-merge.sh b/jjb/dcae/script-apod-cdap-merge.sh
index 23d32eb4b..045baa190 100755
--- a/jjb/dcae/script-apod-cdap-merge.sh
+++ b/jjb/dcae/script-apod-cdap-merge.sh
@@ -75,11 +75,11 @@ cp ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${OUTPUT_DIR}/${OUTPUT_FILE}
echo "Contents of output directory"
ls -lR ${OUTPUT_DIR}
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE}"
echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE} to Nexus: ${SEND_TO}"
curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE} ${SEND_TO}
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} to Nexus: ${SEND_TO}"
curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${SEND_TO}
diff --git a/jjb/dcae/script-apod-cdap-verify.sh b/jjb/dcae/script-apod-cdap-verify.sh
index 23d32eb4b..045baa190 100755
--- a/jjb/dcae/script-apod-cdap-verify.sh
+++ b/jjb/dcae/script-apod-cdap-verify.sh
@@ -75,11 +75,11 @@ cp ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${OUTPUT_DIR}/${OUTPUT_FILE}
echo "Contents of output directory"
ls -lR ${OUTPUT_DIR}
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE}"
echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE} to Nexus: ${SEND_TO}"
curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE} ${SEND_TO}
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} to Nexus: ${SEND_TO}"
curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${SEND_TO}
diff --git a/jjb/dcae/script-dmaapbc-daily-release.sh b/jjb/dcae/script-dmaapbc-daily-release.sh
new file mode 100755
index 000000000..710a3196d
--- /dev/null
+++ b/jjb/dcae/script-dmaapbc-daily-release.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+# Create a debian package and push to remote repo
+#
+#
+# build the docker image. tag and then push to the remote repo
+#
+
+# !!! make sure the yaml file include docker-login as a builder before calling
+# this script
+
+IMAGE="dcae_dmaapbc"
+TAG="1.0.0"
+LFQI="${IMAGE}:${TAG}"
+BUILD_PATH="${WORKSPACE}"
+
+# build a docker image
+docker build --rm -f ${WORKSPACE}/Dockerfile -t ${LFQI} ${BUILD_PATH}
+
+
+#
+# push the image
+#
+# io registry DOCKER_REPOSITORIES="nexus3.openecomp.org:10001 \
+# release registry nexus3.openecomp.org:10002 \
+# snapshot registry nexus3.openecomp.org:10003"
+REPO="nexus3.openecomp.org:10003"
+
+RFQI="${REPO}/${LFQI}"
+# tag
+docker tag ${LFQI} ${RFQI}
+
+# push to remote repo
+docker push ${RFQI}
+
diff --git a/jjb/dcae/script-dmaapbc-merge.sh b/jjb/dcae/script-dmaapbc-merge.sh
new file mode 100755
index 000000000..dd350917e
--- /dev/null
+++ b/jjb/dcae/script-dmaapbc-merge.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# Create a debian package and push to remote repo
+#
+#
+# build the docker image. tag and then push to the remote repo
+#
+
+# !!! make sure the yaml file include docker-login as a builder before calling
+# this script
+
+IMAGE='dcae_dmaapbc'
+TAG='1.0.0'
+LFQI="${IMAGE}:${TAG}"
+BUILD_PATH="${WORKSPACE}"
+
+# build a docker image
+docker build --rm -f "${WORKSPACE}"/Dockerfile -t "${LFQI}" "${BUILD_PATH}"
+
+
+#
+# push the image
+#
+# io registry DOCKER_REPOSITORIES="nexus3.openecomp.org:10001 \
+# release registry nexus3.openecomp.org:10002 \
+# snapshot registry nexus3.openecomp.org:10003"
+REPO='nexus3.openecomp.org:10003'
+RFQI="${REPO}/${LFQI}"
+docker tag ${LFQI} ${RFQI}
+docker push ${RFQI}
+
diff --git a/jjb/dcae/script-dmaapbc-verify.sh b/jjb/dcae/script-dmaapbc-verify.sh
new file mode 100755
index 000000000..8db2c9c74
--- /dev/null
+++ b/jjb/dcae/script-dmaapbc-verify.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Create a debian package and push to remote repo
+#
+#
+# build the docker image. tag and then push to the remote repo
+#
+
+# !!! make sure the yaml file include docker-login as a builder before calling
+# this script
+
+IMAGE="dcae_dmaapbc"
+TAG="1.0.0"
+LFQI="${IMAGE}:${TAG}"
+BUILD_PATH="${WORKSPACE}"
+
+# build a docker image
+docker build --rm -f ${WORKSPACE}/Dockerfile -t ${LFQI} ${BUILD_PATH}
+
+
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 83dafaf7c..a84a7d08c 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -635,10 +635,12 @@
- docker-login
- - maven-docker-push-daily:
- mvn-settings: '{mvn-settings}'
- pom: '{docker-pom}'
- # use default as mvn-profile if profile is not needed
- mvn-profile: '{mvn-profile}'
+ - maven-target:
+ maven-version: 'mvn33'
+ goals: '{mvn-goals}'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
- shell: '{script}'
diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 3f1f20047..c0dfadf59 100644
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -579,7 +579,8 @@
branch: '{branch}'
refspec: 'refs/heads/{branch}'
artifacts: '{archive-artifacts}'
-
+ - maven-exec:
+ maven-version: 'mvn33'
scm:
- gerrit-trigger-scm:
refspec: '$GERRIT_REFSPEC'
@@ -623,3 +624,77 @@
# publishers:
# - ecomp-infra-shiplogs:
# maven-version: 'mvn33'
+
+# vim: sw=2 ts=2 sts=2 et :
+
+- job-template:
+ # Job template for scm and script trigger - for docker merge
+ #
+ # Required Variables:
+ # branch: git branch
+ # build-node: what build node to run on
+ # script: build script to execute
+
+ name: '{project-name}-{stream}-merge-docker-script'
+
+ project-type: freestyle
+ concurrent: true
+ node: '{build-node}'
+
+ 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}'
+ - maven-exec:
+ maven-version: 'mvn33'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: ''
+ choosing-strategy: 'default'
+ - git-extra-project:
+ project: '{extra-project1}'
+ refspec: '{extra-refspec1}'
+ branch: '{extra-branch1}'
+ checkout-dir: '{checkout-dir1}'
+ - git-extra-project:
+ project: '{extra-project2}'
+ refspec: '{extra-refspec2}'
+ branch: '{extra-branch2}'
+ checkout-dir: '{checkout-dir2}'
+
+ wrappers:
+ - ecomp-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}'
+ - docker-login
+ # make sure maven gets installed / setup
+ - maven-target:
+ maven-version: 'mvn33'
+ goals: '--version'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
+ - shell: '{script}'
+
+# publishers:
+# - ecomp-infra-shiplogs:
+# maven-version: 'mvn33' \ No newline at end of file
diff --git a/jjb/policy/include-raw-docker.sh b/jjb/policy/include-raw-docker.sh
index 642d8c23b..735b59d98 100644
--- a/jjb/policy/include-raw-docker.sh
+++ b/jjb/policy/include-raw-docker.sh
@@ -2,12 +2,15 @@
#
echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+DOCKER_REPOSITORY=nexus3.openecomp.org:10003
+
for image in policy-os policy-nexus policy-db policy-base policy-drools policy-pe ; do
mkdir -p target/$image
cp $image/* target/$image
- docker build --quiet --tag ${DOCKER_REPOSITORY}/policy/$image target/$image
+ docker build --quiet --tag ${DOCKER_REPOSITORY}/policy:$image target/$image
done
for image in policy-nexus policy-db policy-drools policy-pe; do
- docker push ${DOCKER_REPOSITORY}/policy/$image
+ docker push ${DOCKER_REPOSITORY}/policy:$image
done
diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml
index e7e5f9f24..71879f16c 100644
--- a/jjb/policy/policy-docker.yaml
+++ b/jjb/policy/policy-docker.yaml
@@ -5,7 +5,7 @@
jobs:
- '{project-name}-{stream}-docker-java-shell-daily':
docker-pom: 'pom.xml'
- mvn-profile: 'prepare-package'
+ mvn-goals: 'prepare-package'
script:
!include-raw-escape: 'include-raw-docker.sh'
diff --git a/jjb/portal/docker-build-push.sh b/jjb/portal/docker-build-push.sh
new file mode 100644
index 000000000..ca2c8760b
--- /dev/null
+++ b/jjb/portal/docker-build-push.sh
@@ -0,0 +1,8 @@
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+ls -ltr
+cd deliveries
+ls -ltr
+chmod 755 *.*
+./os_docker_push.sh \ No newline at end of file
diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml
index 8f9c447c5..33e850c2b 100644
--- a/jjb/portal/portal-docker.yaml
+++ b/jjb/portal/portal-docker.yaml
@@ -4,7 +4,12 @@
name: portal-docker
project-name: 'portal-docker'
jobs:
- - '{project-name}-{stream}-three-scm-verify-script'
+ - '{project-name}-{stream}-three-scm-verify-script':
+ script:
+ !include-raw-escape: 'docker-build-deploy.sh'
+ - '{project-name}-{stream}-merge-docker-script':
+ script:
+ !include-raw-escape: 'docker-build-push.sh'
project: 'portal'
stream:
@@ -22,5 +27,3 @@
extra-branch2: 'master'
extra-refspec2: 'refs/heads/{branch}'
checkout-dir2: 'dmaapbc'
- script:
- !include-raw-escape: 'docker-build-deploy.sh'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 0b173997d..124a47bab 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -5,8 +5,12 @@
project-name: 'sdc'
jobs:
- '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
-
+ - '{project-name}-{stream}-merge-java':
+ mvn-goals: 'clean install'
+ - '{project-name}-{stream}-docker-java-daily':
+ docker-pom: 'pom.xml'
+ mvn-profile: 'docker'
+ mvn-goals: 'clean install -B -P {mvn-profile}'
project: 'sdc'
stream:
- 'master':
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 467cc3a5e..ce1ec7c6b 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -17,3 +17,4 @@
mvn-settings: 'vid-settings'
files: '**'
archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g