summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
m---------jjb/global-jjb0
-rwxr-xr-xjjb/include-docker-push.sh4
-rw-r--r--jjb/portal/portal-sdk.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement.yaml5
4 files changed, 4 insertions, 7 deletions
diff --git a/jjb/global-jjb b/jjb/global-jjb
-Subproject 21f2869c8f8ac7b2b21130eb16231a8df2904f5
+Subproject c38dce2088f0833b94b8811bbd1efc3e74e8b06
diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh
index df42fa7b9..c0394de81 100755
--- a/jjb/include-docker-push.sh
+++ b/jjb/include-docker-push.sh
@@ -29,12 +29,12 @@ if [ ! -z "$DOCKER_IMAGE_NAME" ]; then
# tag image with nexus3 proxy prefix
docker tag ${DOCKER_IMAGE_NAME} $REPO_PATH
elif [[ $PROJECT =~ $SEARCH ]] ; then
- REPO_PATH=$DOCKER_REPOSITORY/openecomp/ajsc-aai;
+ REPO_PATH=$DOCKER_REPOSITORY/onap/ajsc-aai;
else
# Cut the prefix aai/ in example aai/model-loader
DOCKER_REPO_NAME=$(echo ${PROJECT} | cut -d"/" -f2-);
- REPO_PATH=$DOCKER_REPOSITORY/openecomp/${DOCKER_REPO_NAME};
+ REPO_PATH=$DOCKER_REPOSITORY/onap/${DOCKER_REPO_NAME};
fi
diff --git a/jjb/portal/portal-sdk.yaml b/jjb/portal/portal-sdk.yaml
index 63304419d..bb2e3a482 100644
--- a/jjb/portal/portal-sdk.yaml
+++ b/jjb/portal/portal-sdk.yaml
@@ -23,6 +23,8 @@
branch: 'master'
- 'release-1.3.0':
branch: 'release-1.3.0'
+ - 'release-1.3.1':
+ branch: 'release-1.3.1'
mvn-settings: 'portal-sdk-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 08cd40331..2dc778d16 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -9,15 +9,10 @@
- 'master':
branch: 'master'
build-node: ubuntu1604-basebuild-4c-4g
- subproject:
- - 'deployment':
- pom: 'ResmanagementService/deployment/pom.xml'
- pattern: 'ResmanagementService/deployment/**'
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- - '{project-name}-{stream}-{subproject}-release-version-java-daily'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'install'