diff options
m--------- | jjb/global-jjb | 0 | ||||
-rwxr-xr-x | jjb/include-docker-push.sh | 4 | ||||
-rw-r--r-- | jjb/portal/portal-sdk.yaml | 2 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-resmanagement.yaml | 5 | ||||
-rw-r--r-- | packer/provision/basebuild.sh | 4 |
5 files changed, 6 insertions, 9 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' diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh index 853afc7dd..a0d34e72e 100644 --- a/packer/provision/basebuild.sh +++ b/packer/provision/basebuild.sh @@ -13,7 +13,7 @@ rh_systems() { yum install -y openssl-devel mysql-devel gcc # Autorelease support packages - yum install -y firefox python-tox xmlstarlet xvfb + yum install -y firefox python-tox xmlstarlet xvfb crudini # Install chrome to support ChromeDriver cat <<EOF > /etc/yum.repos.d/google-chrome.repo @@ -65,7 +65,7 @@ ubuntu_systems() { apt-get install -y libssl-dev libmysqlclient-dev gcc # Autorelease support packages - apt-get install -y firefox python-tox xmlstarlet xvfb + apt-get install -y firefox python-tox xmlstarlet xvfb crudini # Install chrome to support ChromeDriver wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - |