diff options
4 files changed, 56 insertions, 4 deletions
diff --git a/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh b/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh index 61026d7b0..1d1d0fd3e 100644 --- a/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh +++ b/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh @@ -16,8 +16,8 @@ NEXUS_USERNAME=docker NEXUS_PASSWD=docker -NEXUS_DOCKER_REPO=nexus3.onap.org:10001 -DOCKER_IMAGE_VERSION=latest +export NEXUS_DOCKER_REPO=nexus3.onap.org:10001 +export DOCKER_IMAGE_VERSION=latest echo "This is ${WORKSPACE}/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh" diff --git a/test/csit/scripts/vid/start_vid_containers.sh b/test/csit/scripts/vid/start_vid_containers.sh index a6a8a6b7a..341fd4813 100644 --- a/test/csit/scripts/vid/start_vid_containers.sh +++ b/test/csit/scripts/vid/start_vid_containers.sh @@ -32,7 +32,7 @@ export IP=`ifconfig eth0 | awk -F: '/inet addr/ {gsub(/ .*/,"",$2); print $2}'` export PREFIX='nexus3.onap.org:10001/onap' #start Maria-DB -docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp_epsdk -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -e MYSQL_ROOT_PASSWORD=LF+tp_1WqgSY -v ${CONFIG_PATH}/vid-my.cnf:/etc/mysql/my.cnf -v ${CONFIG_PATH}/vid-pre-init.sql:/docker-entrypoint-initdb.d/vid-pre-init.sql -v /var/lib/mysql -d mariadb:10 +docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp_epsdk -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -e MYSQL_ROOT_PASSWORD=LF+tp_1WqgSY -v ${CONFIG_PATH}/vid-my.cnf:/etc/mysql/my.cnf -v ${CONFIG_PATH}/vid-schema.sql:/docker-entrypoint-initdb.d/vid-schema.sql -v /var/lib/mysql -d mariadb:10 #start VID server diff --git a/test/mocks/pnfsimulator/docker-compose.yml b/test/mocks/pnfsimulator/docker-compose.yml index d6f376f8c..6a381bd75 100644 --- a/test/mocks/pnfsimulator/docker-compose.yml +++ b/test/mocks/pnfsimulator/docker-compose.yml @@ -32,7 +32,7 @@ services: container_name: sftp-server image: atmoz/sftp:alpine ports: - - "22:22" + - "2222:22" volumes: - ./sftp:/home/sftp-user/sftp restart: on-failure diff --git a/version-manifest/src/main/scripts/upgrade-oparent.sh b/version-manifest/src/main/scripts/upgrade-oparent.sh new file mode 100755 index 000000000..aec665ee9 --- /dev/null +++ b/version-manifest/src/main/scripts/upgrade-oparent.sh @@ -0,0 +1,52 @@ +#!/bin/bash +# +# Copyright 2017 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +cat projects.txt | grep -v oparent | grep -v doc | grep -v ci-management | while read p; do + pushd $p + + #git fetch origin + #git reset --hard origin + for pom in $(find -name pom.xml); do + git checkout origin/master -- $pom + dos2unix < $pom | cmp -s - $pom + IS_DOS=$? + if grep -q "oparent" $pom; then + xmlstarlet ed -L -P -N ns="http://maven.apache.org/POM/4.0.0" -u '/_:project/_:parent[_:groupId="org.onap.oparent" and _:artifactId="oparent"]/_:version' -v '1.2.0' $pom + sed -i 's/^[ \t]*$//' $pom + fi + if grep -q "guava" $pom; then + xmlstarlet ed -L -P -N ns="http://maven.apache.org/POM/4.0.0" -d '//_:dependency[_:groupId="com.google.guava" and _:artifactId="guava"]/_:version' $pom + sed -i 's/^[ \t]*$//' $pom + fi + if [ $IS_DOS -ne 0 ]; then + unix2dos $pom + fi + done + git --no-pager diff + + + if [ $(git rev-parse HEAD) == $(git rev-parse @{u}) ]; then + + git commit -a -s -m 'Use managed guava version + +Use centrally managed guava version specified in +oparent. Includes upgrade to oparent 1.2.0. + +This change was submitted by script and may include +additional whitespace or formatting changes. + +Issue-ID: INT-619 +' + else + git commit -a -s --amend --no-edit + fi + git review -r origin -D + popd +done |