diff options
3 files changed, 42 insertions, 5 deletions
diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 87f6fd6f9..0d604eb28 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -1,4 +1,10 @@ image,tag +onap/aaf/aaf_cm,2.1.0-SNAPSHOT +onap/aaf/aaf_fs,2.1.0-SNAPSHOT +onap/aaf/aaf_gui,2.1.0-SNAPSHOT +onap/aaf/aaf_hello,2.1.0-SNAPSHOT +onap/aaf/aaf_locate,2.1.0-SNAPSHOT +onap/aaf/aaf_oauth,2.1.0-SNAPSHOT onap/aaf/aaf_service,2.1.0-SNAPSHOT onap/aaf/authz-service,latest onap/aaf/sms,latest diff --git a/version-manifest/src/main/scripts/merge-oom-images.sh b/version-manifest/src/main/scripts/merge-oom-images.sh index 09bc12fd2..248bc331c 100755 --- a/version-manifest/src/main/scripts/merge-oom-images.sh +++ b/version-manifest/src/main/scripts/merge-oom-images.sh @@ -1,13 +1,14 @@ #!/bin/bash if [ "$#" -ne 2 ]; then + echo This script adds docker images that exist in OOM helm charts into docker-manifest.csv echo "$0 <docker-manifest.csv> <oom directory>" exit 1 fi # expected parameters -MANIFEST=$1 -OOM_DIR=$2 +MANIFEST=$(realpath $1) +OOM_DIR=$(realpath $2) if [ -z "$WORKSPACE" ]; then export WORKSPACE=`git rev-parse --show-toplevel` @@ -20,7 +21,7 @@ mkdir -p $TARGET_DIR cd $TARGET_DIR cd $OOM_DIR -rgrep "image: .*" --include=values.yaml -h | cut -d ' ' -f 2 | tr -d '"'| grep -v '<' | grep -e "^onap" -e "^openecomp" | LC_ALL=C sort > $TARGET_DIR/oom-manifest.txt +rgrep "image: .*" --include=values.yaml -h | cut -d ' ' -f 2 | tr -d '"'| grep -v '<' | grep -e "^onap" -e "^openecomp" | LC_ALL=C sort -u > $TARGET_DIR/oom-manifest.txt touch $TARGET_DIR/docker-manifest-new-entries.txt for line in $(cat $TARGET_DIR/oom-manifest.txt); do @@ -34,5 +35,5 @@ for line in $(cat $TARGET_DIR/oom-manifest.txt); do fi done -cat $MANIFEST $TARGET_DIR/docker-manifest-new-entries.txt | LC_ALL=C sort > $MANIFEST.tmp -cp $MANIFEST.tmp $MANIFEST +cat $MANIFEST $TARGET_DIR/docker-manifest-new-entries.txt | LC_ALL=C sort -u > $MANIFEST.tmp +mv $MANIFEST.tmp $MANIFEST diff --git a/version-manifest/src/main/scripts/update-oom-image-versions.sh b/version-manifest/src/main/scripts/update-oom-image-versions.sh new file mode 100755 index 000000000..eba847841 --- /dev/null +++ b/version-manifest/src/main/scripts/update-oom-image-versions.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +if [ "$#" -ne 2 ]; then + echo This script updates OOM helm charts to use versions in docker-manifest.csv + echo "$0 <docker-manifest.csv> <oom directory>" + exit 1 +fi + +# expected parameters +MANIFEST=$(realpath $1) +OOM_DIR=$(realpath $2) + +if [ -z "$WORKSPACE" ]; then + export WORKSPACE=`git rev-parse --show-toplevel` +fi + +DIR=$(dirname $(readlink -f "$0")) +TARGET_DIR=$DIR/target +rm -rf $TARGET_DIR +mkdir -p $TARGET_DIR +cd $TARGET_DIR + +cd $OOM_DIR/kubernetes + +for line in $(tail -n +2 $MANIFEST); do + image=$(echo $line | cut -d , -f 1) + tag=$(echo $line | cut -s -d , -f 2) + perl -p -i -e "s|image: $image(:.*$\|$)|image: $image:$tag|g" $(find ./ -name values.yaml) +done + |