Merge "Add step for version to docker java properties"
diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh
index df42fa7..c0394de 100755
--- a/jjb/include-docker-push.sh
+++ b/jjb/include-docker-push.sh
@@ -29,12 +29,12 @@
# 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/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml
index 46e1688..b1124ab 100644
--- a/jjb/vid/vid-csit.yaml
+++ b/jjb/vid/vid-csit.yaml
@@ -9,6 +9,6 @@
functionality:
- 'healthCheck':
trigger_jobs:
- - '{project-name}-{stream}-release-java-daily-checkstyle'
+ - '{project-name}-{stream}-docker-version-java-daily'
robot-options: ''
branch: 'master'
diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh
index 853afc7..a0d34e7 100644
--- a/packer/provision/basebuild.sh
+++ b/packer/provision/basebuild.sh
@@ -13,7 +13,7 @@
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 @@
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 -