summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/aai/aai-aai-service.yaml6
-rw-r--r--jjb/aai/aai-model-loader.yaml6
-rw-r--r--jjb/dcae/apod-analytics.yaml4
-rwxr-xr-xjjb/dcae/script-apod-analytics-daily-release.sh11
-rwxr-xr-xjjb/dcae/script-apod-analytics-merge.sh11
-rwxr-xr-xjjb/dcae/script-apod-analytics-verify.sh17
-rwxr-xr-xjjb/dcae/script-apod-cdap-daily-release.sh6
-rwxr-xr-xjjb/dcae/script-apod-cdap-merge.sh6
-rwxr-xr-xjjb/dcae/script-apod-cdap-verify.sh12
-rwxr-xr-xjjb/dcae/script-dmaapbc-merge.sh8
-rw-r--r--jjb/global-templates-java.yaml65
-rw-r--r--jjb/include-docker-push.sh10
-rw-r--r--jjb/policy/include-raw-docker-verify.sh12
-rw-r--r--jjb/policy/include-raw-docker.sh9
-rw-r--r--jjb/policy/policy-docker.yaml7
-rw-r--r--jjb/sdc/sdc.yaml9
-rw-r--r--jjb/sdnc/sdnc-adaptors.yaml2
-rw-r--r--jjb/sdnc/sdnc-core.yaml2
-rw-r--r--jjb/sdnc/sdnc-northbound.yaml2
-rw-r--r--jjb/sdnc/sdnc-oam.yaml2
-rw-r--r--jjb/sdnc/sdnc-plugins.yaml2
21 files changed, 151 insertions, 58 deletions
diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml
index e4ca295a7..89aeedbe7 100644
--- a/jjb/aai/aai-aai-service.yaml
+++ b/jjb/aai/aai-aai-service.yaml
@@ -6,9 +6,9 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-java-daily'
- - '{project-name}-{stream}-docker-java-daily':
- docker-pom: 'ajsc-aai/pom.xml'
- mvn-profile: 'docker'
+ - '{project-name}-{stream}-aai-docker-java-daily':
+ pom: 'ajsc-aai/pom.xml'
+ mvn-goals: '-P docker'
project: 'aai/aai-service'
stream:
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index a6c0b76fd..293c47137 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -6,9 +6,9 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-java-daily'
- - '{project-name}-{stream}-docker-java-daily':
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
+ - '{project-name}-{stream}-aai-docker-java-daily':
+ pom: 'pom.xml'
+ mvn-goals: '-P docker'
project: 'aai/model-loader'
stream:
- 'master':
diff --git a/jjb/dcae/apod-analytics.yaml b/jjb/dcae/apod-analytics.yaml
index 887635f7d..96e9780cc 100644
--- a/jjb/dcae/apod-analytics.yaml
+++ b/jjb/dcae/apod-analytics.yaml
@@ -32,8 +32,8 @@
- '{project-name}-{stream}-verify-2scm-mvn-script':
mvn-goals: 'clean install'
script:
- !include-raw-escape: 'script-apod-analytics-merge.sh'
+ !include-raw-escape: 'script-apod-analytics-verify.sh'
- '{project-name}-{stream}-merge-2scm-mvn-script':
mvn-goals: 'clean install'
script:
- !include-raw-escape: 'script-apod-analytics-verify.sh'
+ !include-raw-escape: 'script-apod-analytics-merge.sh'
diff --git a/jjb/dcae/script-apod-analytics-daily-release.sh b/jjb/dcae/script-apod-analytics-daily-release.sh
index 9b17374e9..7a15c2f07 100755
--- a/jjb/dcae/script-apod-analytics-daily-release.sh
+++ b/jjb/dcae/script-apod-analytics-daily-release.sh
@@ -8,7 +8,7 @@ echo '================= STARTING SCRIPT TO CREATE DEBIAN FILE ================='
# Extract the username and password for the nexus repo
USER=$(xpath -q -e "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE")
PASS=$(xpath -q -e "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE")
-OPENECOMP_NEXUS_REPO="${NEXUSPROXY}/content/sites/raw"
+REPO="${NEXUSPROXY}/content/sites/raw"
#Create a netrc file for use with curl
NETRC=$(mktemp)
@@ -51,7 +51,10 @@ mkdir -p ${STAGE_DIR}/stage/opt/app/cdap-apps
mkdir -p ${OUTPUT_DIR}
echo 'Copying jar file to stage'
-cp ${WORKSPACE}/dcae-analytics-tca/target/dcae-analytics-tca-${POM_VERSION}.jar \
+JAR_FILE=$(ls ${WORKSPACE}/dcae-analytics-tca/target/ | \
+ grep dcae-analytics-tca- | grep -v javadoc | grep -v sources)
+
+cp ${WORKSPACE}/dcae-analytics-tca/target/${JAR_FILE} \
${STAGE_DIR}/stage/opt/app/cdap-apps
echo 'Copying json file to stage'
@@ -78,11 +81,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.apod.analytics/deb-snapshots/${OUTPUT_FILE}"
+SEND_TO="${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.apod.analytics/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
+SEND_TO="${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 fedf54fa1..da379784d 100755
--- a/jjb/dcae/script-apod-analytics-merge.sh
+++ b/jjb/dcae/script-apod-analytics-merge.sh
@@ -8,7 +8,7 @@ echo '================ STARTING SCRIPT TO CREATE DEBIAN FILE =================='
# Extract the username, password for the nexus repo from the maven settings file
USER=$(xpath -q -e "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE")
PASS=$(xpath -q -e "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE")
-OPENECOMP_NEXUS_REPO="${NEXUSPROXY}/content/sites/raw"
+REPO="${NEXUSPROXY}/content/sites/raw"
#Create a netrc file for use with curl
NETRC=$(mktemp)
@@ -51,7 +51,10 @@ mkdir -p ${STAGE_DIR}/stage/opt/app/cdap-apps
mkdir -p ${OUTPUT_DIR}
echo 'Copying jar file to stage'
-cp ${WORKSPACE}/dcae-analytics-tca/target/dcae-analytics-tca-${POM_VERSION}.jar \
+JAR_FILE=$(ls ${WORKSPACE}/dcae-analytics-tca/target/ | \
+ grep dcae-analytics-tca- | grep -v javadoc | grep -v sources)
+
+cp ${WORKSPACE}/dcae-analytics-tca/target/${JAR_FILE} \
${STAGE_DIR}/stage/opt/app/cdap-apps
echo 'Copying json file to stage'
@@ -78,11 +81,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.apod.analytics/deb-snapshots/${OUTPUT_FILE}"
+SEND_TO="${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.apod.analytics/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
+SEND_TO="${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 e12dfa493..6ce3edfba 100755
--- a/jjb/dcae/script-apod-analytics-verify.sh
+++ b/jjb/dcae/script-apod-analytics-verify.sh
@@ -8,7 +8,7 @@ echo '================ STARTING SCRIPT TO CREATE DEBIAN FILE =================='
# Extract the username and password and URL for the nexus repo"
USER=$(xpath -q -e "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE")
PASS=$(xpath -q -e "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE")
-OPENECOMP_NEXUS_REPO="${NEXUSPROXY}/content/sites/raw"
+REPO="${NEXUSPROXY}/content/sites/raw"
#Create a netrc file for use with curl
NETRC=$(mktemp)
@@ -51,7 +51,10 @@ mkdir -p ${STAGE_DIR}/stage/opt/app/cdap-apps
mkdir -p ${OUTPUT_DIR}
echo 'Copying jar file to stage'
-cp ${WORKSPACE}/dcae-analytics-tca/target/dcae-analytics-tca-${POM_VERSION}.jar \
+JAR_FILE=$(ls ${WORKSPACE}/dcae-analytics-tca/target/ | \
+ grep dcae-analytics-tca- | grep -v javadoc | grep -v sources)
+
+cp ${WORKSPACE}/dcae-analytics-tca/target/${JAR_FILE} \
${STAGE_DIR}/stage/opt/app/cdap-apps
echo 'Copying json file to stage'
@@ -72,19 +75,11 @@ ${WORKSPACE}/dcae-apod-buildtools/scripts/package -b debian -d ${STAGE_DIR} \
# date stamp and build number on it.
# For example: dcae-analytics-tca_17.01.0-YYYYMMDDHHMMSS-XXX.deb
# Both files will then be uploaded to the repository.
+# Verify script does not upload to Nexus repo.
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.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.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}
-
echo '================ ENDING SCRIPT TO CREATE DEBIAN FILE ===================='
diff --git a/jjb/dcae/script-apod-cdap-daily-release.sh b/jjb/dcae/script-apod-cdap-daily-release.sh
index 045baa190..05e803255 100755
--- a/jjb/dcae/script-apod-cdap-daily-release.sh
+++ b/jjb/dcae/script-apod-cdap-daily-release.sh
@@ -6,7 +6,7 @@ echo '================= STARTING SCRIPT TO CREATE DEBIAN FILE ================='
# Extract the username and password to the nexus repo from the settings file
USER=$(xpath -q -e "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE")
PASS=$(xpath -q -e "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE")
-OPENECOMP_NEXUS_REPO="${NEXUSPROXY}/content/sites/raw"
+REPO="${NEXUSPROXY}/content/sites/raw"
#Create a netrc file for use with curl
NETRC=$(mktemp)
@@ -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.apod.cdap/deb-snapshots/${OUTPUT_FILE}"
+SEND_TO="${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.apod.cdap/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
+SEND_TO="${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 045baa190..05e803255 100755
--- a/jjb/dcae/script-apod-cdap-merge.sh
+++ b/jjb/dcae/script-apod-cdap-merge.sh
@@ -6,7 +6,7 @@ echo '================= STARTING SCRIPT TO CREATE DEBIAN FILE ================='
# Extract the username and password to the nexus repo from the settings file
USER=$(xpath -q -e "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE")
PASS=$(xpath -q -e "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE")
-OPENECOMP_NEXUS_REPO="${NEXUSPROXY}/content/sites/raw"
+REPO="${NEXUSPROXY}/content/sites/raw"
#Create a netrc file for use with curl
NETRC=$(mktemp)
@@ -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.apod.cdap/deb-snapshots/${OUTPUT_FILE}"
+SEND_TO="${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.apod.cdap/deb-snapshots/${OUTPUT_FILE_DATE_STAMPED}"
+SEND_TO="${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 045baa190..d3aa1ed8c 100755
--- a/jjb/dcae/script-apod-cdap-verify.sh
+++ b/jjb/dcae/script-apod-cdap-verify.sh
@@ -6,7 +6,7 @@ echo '================= STARTING SCRIPT TO CREATE DEBIAN FILE ================='
# Extract the username and password to the nexus repo from the settings file
USER=$(xpath -q -e "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE")
PASS=$(xpath -q -e "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE")
-OPENECOMP_NEXUS_REPO="${NEXUSPROXY}/content/sites/raw"
+REPO="${NEXUSPROXY}/content/sites/raw"
#Create a netrc file for use with curl
NETRC=$(mktemp)
@@ -69,19 +69,11 @@ ${WORKSPACE}/dcae-apod-buildtools/scripts/package -b debian -d ${STAGE_DIR} \
# date stamp and build number on it.
# For example: dcae-cda-small-hadoop_17.01.0-YYYYMMDDHHMMSS-XXX.deb
# Both files will then be uploaded to the repository.
+# Verify script does not upload to Nexus
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.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.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}
-
echo '================= ENDING SCRIPT TO CREATE DEBIAN FILE ==================='
diff --git a/jjb/dcae/script-dmaapbc-merge.sh b/jjb/dcae/script-dmaapbc-merge.sh
index a80190f10..dd350917e 100755
--- a/jjb/dcae/script-dmaapbc-merge.sh
+++ b/jjb/dcae/script-dmaapbc-merge.sh
@@ -8,13 +8,13 @@
# !!! make sure the yaml file include docker-login as a builder before calling
# this script
-IMAGE="dcae_dmaapbc"
-TAG="1.0.0"
+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}
+docker build --rm -f "${WORKSPACE}"/Dockerfile -t "${LFQI}" "${BUILD_PATH}"
#
@@ -23,7 +23,7 @@ docker build --rm -f ${WORKSPACE}/Dockerfile -t ${LFQI} ${BUILD_PATH}
# io registry DOCKER_REPOSITORIES="nexus3.openecomp.org:10001 \
# release registry nexus3.openecomp.org:10002 \
# snapshot registry nexus3.openecomp.org:10003"
-REPO="nexus3.openecomp.org:10002"
+REPO='nexus3.openecomp.org:10003'
RFQI="${REPO}/${LFQI}"
docker tag ${LFQI} ${RFQI}
docker push ${RFQI}
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index a84a7d08c..7b173e9ba 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -644,3 +644,68 @@
global-settings-type: cfp
- shell: '{script}'
+
+- job-template:
+ name: '{project-name}-{stream}-aai-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:
+ # 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: 'mvn33'
+ pom: 'pom.xml'
+ goals: 'clean install -DskipTests'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
+
+ - maven-target:
+ maven-version: 'mvn33'
+ pom: '{pom}'
+ goals: '{mvn-goals}'
+ 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
+
+ - shell: !include-raw: include-docker-push.sh
diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh
new file mode 100644
index 000000000..1017d549c
--- /dev/null
+++ b/jjb/include-docker-push.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+DOCKER_REPOSITORY="nexus3.openecomp.org:10003"
+SEARCH="aai-service";
+
+if [[ $PROJECT =~ $SEARCH ]] ; then
+ docker push $DOCKER_REPOSITORY/ecomp/ajsc-aai:latest;
+else
+ docker push $DOCKER_REPOSITORY/ecomp/model-loader:latest;
+fi
diff --git a/jjb/policy/include-raw-docker-verify.sh b/jjb/policy/include-raw-docker-verify.sh
new file mode 100644
index 000000000..d1943ba7c
--- /dev/null
+++ b/jjb/policy/include-raw-docker-verify.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+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
+ echo "Building $image"
+ mkdir -p target/$image
+ cp $image/* target/$image
+done
diff --git a/jjb/policy/include-raw-docker.sh b/jjb/policy/include-raw-docker.sh
index 642d8c23b..73581076e 100644
--- a/jjb/policy/include-raw-docker.sh
+++ b/jjb/policy/include-raw-docker.sh
@@ -2,12 +2,17 @@
#
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
+ echo "Building $image"
mkdir -p target/$image
cp $image/* target/$image
- docker build --quiet --tag ${DOCKER_REPOSITORY}/policy/$image target/$image
+ docker build --quiet --tag ${DOCKER_REPOSITORY}/openecomp/policy:$image target/$image
done
for image in policy-nexus policy-db policy-drools policy-pe; do
- docker push ${DOCKER_REPOSITORY}/policy/$image
+ echo "Pushing $image"
+ docker push ${DOCKER_REPOSITORY}/openecomp/policy:$image
done
diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml
index 71879f16c..4489304ef 100644
--- a/jjb/policy/policy-docker.yaml
+++ b/jjb/policy/policy-docker.yaml
@@ -3,6 +3,13 @@
name: policy-docker
project-name: 'policy-docker-policy'
jobs:
+ - '{project-name}-{stream}-verify-script':
+ script:
+ !include-raw-escape: 'include-raw-docker-verify.sh'
+ - '{project-name}-{stream}-merge-scm-mvn-script':
+ mvn-goals: '--version'
+ script:
+ !include-raw-escape: 'include-raw-docker-verify.sh'
- '{project-name}-{stream}-docker-java-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'prepare-package'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 124a47bab..6f824e583 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -6,11 +6,12 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java':
- mvn-goals: 'clean install'
+ mvn-goals: 'clean install'
+ build-node: ubuntu1604-basebuild-8c-8g
- '{project-name}-{stream}-docker-java-daily':
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- mvn-goals: 'clean install -B -P {mvn-profile}'
+ docker-pom: 'pom.xml'
+ mvn-profile: 'docker'
+ mvn-goals: 'clean install -B -P {mvn-profile}'
project: 'sdc'
stream:
- 'master':
diff --git a/jjb/sdnc/sdnc-adaptors.yaml b/jjb/sdnc/sdnc-adaptors.yaml
index b7af34fda..1d82461a2 100644
--- a/jjb/sdnc/sdnc-adaptors.yaml
+++ b/jjb/sdnc/sdnc-adaptors.yaml
@@ -11,7 +11,7 @@
stream:
- 'master':
branch: 'master'
- mvn-settings: 'mso-settings'
+ mvn-settings: 'sdnc-adaptors-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
diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml
index c172e6917..dead3f667 100644
--- a/jjb/sdnc/sdnc-core.yaml
+++ b/jjb/sdnc/sdnc-core.yaml
@@ -11,7 +11,7 @@
stream:
- 'master':
branch: 'master'
- mvn-settings: 'mso-settings'
+ mvn-settings: 'sdnc-core-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
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 0c1812b2c..5fd5d38f7 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -11,7 +11,7 @@
stream:
- 'master':
branch: 'master'
- mvn-settings: 'mso-settings'
+ mvn-settings: 'sdnc-northbound-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
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 0b1c1fa41..e41de42de 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -15,7 +15,7 @@
stream:
- 'master':
branch: 'master'
- mvn-settings: 'mso-settings'
+ mvn-settings: 'sdnc-oam-settings'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml
index b8b4f4fd6..44c764a7b 100644
--- a/jjb/sdnc/sdnc-plugins.yaml
+++ b/jjb/sdnc/sdnc-plugins.yaml
@@ -11,7 +11,7 @@
stream:
- 'master':
branch: 'master'
- mvn-settings: 'mso-settings'
+ mvn-settings: 'sdnc-plugins-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