diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mvn-phase-lib.sh | 201 | ||||
| -rw-r--r-- | scripts/pom.xml | 2 |
2 files changed, 138 insertions, 65 deletions
diff --git a/scripts/mvn-phase-lib.sh b/scripts/mvn-phase-lib.sh index 6cef83e..2bf82bd 100644 --- a/scripts/mvn-phase-lib.sh +++ b/scripts/mvn-phase-lib.sh @@ -1,7 +1,7 @@ #!/bin/bash # ================================================================================ -# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,8 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. #MVN_PROJECT_MODULEID="$1" @@ -52,16 +50,18 @@ if [ -z "$WORKSPACE" ]; then WORKSPACE=$(pwd) fi -if [ -z "$SETTINGS_FILE" ]; then - echo "SETTINGS_FILE environment variable not set. Cannot proceed" - exit -fi +export SETTINGS_FILE=${SETTINGS_FILE:-$HOME/.m2/settings.xml} +RELEASE_TAG=${MVN_RELEASE_TAG:-R3} +if [ "$RELEASE_TAG" == "R1" ]; then + unset RELEASE_TAG +fi # mvn phase in life cycle MVN_PHASE="$2" +echo "MVN_RELEASE_TAG is [$MVN_RELEASE_TAG]" echo "MVN_PROJECT_MODULEID is [$MVN_PROJECT_MODULEID]" echo "MVN_PHASE is [$MVN_PHASE]" echo "MVN_PROJECT_GROUPID is [$MVN_PROJECT_GROUPID]" @@ -76,7 +76,6 @@ echo "MVN_RAWREPO_SERVERID is [$MVN_RAWREPO_SERVERID]" echo "MVN_DOCKERREGISTRY_SNAPSHOT is [$MVN_DOCKERREGISTRY_SNAPSHOT]" echo "MVN_DOCKERREGISTRY_PUBLIC is [$MVN_DOCKERREGISTRY_PUBLIC]" echo "MVN_DOCKERREGISTRY_RELEASE is [$MVN_DOCKERREGISTRY_RELEASE]" - echo "MVN_PYPISERVER_SERVERID [$MVN_PYPISERVER_SERVERID]" echo "MVN_PYPISERVER_BASEURL is [$MVN_PYPISERVER_BASEURL]" @@ -108,19 +107,30 @@ expand_templates() export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.platform.plugins" export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_blueprints_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.platform.blueprints" export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_blueprints_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.platform.blueprints" - - export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2/releases" - export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2/snapshots" - export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.plugins/releases" - export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.plugins/snapshots" - export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.blueprints/releases" - export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.blueprints/snapshots" + + + if [ -z "$RELEASE_TAG" ]; then + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2/releases" + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2/snapshots" + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.plugins/releases" + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.plugins/snapshots" + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.blueprints/releases" + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.blueprints/snapshots" + else + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2/$RELEASE_TAG" + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2/$RELEASE_TAG" + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.plugins/$RELEASE_TAG" + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.plugins/$RELEASE_TAG" + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.blueprints/$RELEASE_TAG" + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.blueprints/$RELEASE_TAG" + fi + export ONAPTEMPLATE_PYPIURL_org_onap_dcaegen2="${MVN_PYPISERVER_BASEURL}" # docker registry templates are for poll, so use PUBLIC registry - export ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases="$MVN_DOCKERREGISTRY_PUBLIC" - export ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_snapshots="${MVN_DOCKERREGISTRY_PUBLIC}/snapshots" + export ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases="${MVN_DOCKERREGISTRY_PUBLIC}" + export ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_snapshots="${MVN_DOCKERREGISTRY_PUBLIC}" # Mvn repo export ONAPTEMPLATE_MVN_org_onap_dcaegen2_analytics_tca_snapshots="${MVN_NEXUSPROXY}/service/local/repositories/snapshots/content/org/onap/dcaegen2/analytics/tca" @@ -171,7 +181,7 @@ expand_templates() echo "====> Resolving the following template from environment variables " echo "$TEMPLATES" for KEY in $TEMPLATES; do - VALUE1=$(eval 'echo "$"'"$KEY"'"' | sed 1q) + VALUE1=$(eval 'echo "$'"$KEY"'"' | sed 1q) VALUE2=$(eval 'echo "$'"$KEY"'"' | sed -e 's/\//\\\//g' -e 's/$/\\/' -e '$s/\\$//') echo "======> Resolving template $KEY to value $VALUE1 for file $F2" @@ -191,12 +201,12 @@ test_templates() find . -name '*-template' | sed -e 's/-template$//' | while read file do - egrep '^ - .?https?://' < $file + egrep '^ - .?https?://' < "$file" done | awk '{print $2}' | sed -e 's/"//g' | sort -u | while read url do - curl -L -w '%{http_code}' -s -o /dev/null "$url" > $TMP - case $(< $TMP) in + curl -L -w '%{http_code}' -s -o /dev/null "$url" > "$TMP" + case $(< "$TMP") in 2* ) ;; * ) echo ">>>>>>>>>>>>>>>> $url not found <<<<<<<<<<<<<<<<" ;; esac @@ -207,14 +217,14 @@ test_templates() find . -name '*-template' | sed -e 's/-template$//' | while read blueprint do - check-blueprint-vs-input -b $blueprint -i check-blueprint-vs-input/lib/sample-inputs.yaml || true + check-blueprint-vs-input -b "$blueprint" -i check-blueprint-vs-input/lib/sample-inputs.yaml || true done } run_tox_test() { - set -x + set -e -x CURDIR=$(pwd) TOXINIS=$(find . -name "tox.ini") for TOXINI in "${TOXINIS[@]}"; do @@ -223,8 +233,9 @@ run_tox_test() rm -rf ./venv-tox ./.tox virtualenv ./venv-tox source ./venv-tox/bin/activate - pip install --upgrade pip - pip install --upgrade tox argparse + pip install pip==9.0.3 + pip install --upgrade argparse + pip install tox==2.9.1 pip freeze tox deactivate @@ -250,17 +261,40 @@ build_wagons() echo "In $PLUGIN_DIR, build plugin $PLUGIN_NAME, version $PLUGIN_VERSION" - wagon create --format tar.gz "${PLUGIN_DIR}" + wagon create -r "${PLUGIN_DIR}/requirements.txt" --format tar.gz "${PLUGIN_DIR}" PKG_FILE_NAMES=( "${PLUGIN_NAME}-${PLUGIN_VERSION}"*.wgn ) echo Built package: "${PKG_FILE_NAMES[@]}" - cd $CURDIR + cd "$CURDIR" done deactivate rm -rf venv-pkg } +build_archives_for_wagons() +{ + rm -rf ./*.tgz ./*.zip venv-pkg + + SETUPFILES=$(find "$(pwd)" -name "setup.py") + CURDIR=$(pwd) + for SETUPFILE in $SETUPFILES; do + PLUGIN_FULL_DIR=$(dirname "$SETUPFILE") + PLUGIN_BASE_DIR=$(basename "$PLUGIN_FULL_DIR") + PLUGIN_NAME=$(grep 'name' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g') + PLUGIN_VERSION=$(grep 'version' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9\.]*//g') + + cd "${PLUGIN_FULL_DIR}"/.. + echo "In $(pwd), build plugin zip $PLUGIN_NAME, version $PLUGIN_VERSION" + + zip -r "${PLUGIN_NAME}-${PLUGIN_VERSION}.zip" "./${PLUGIN_BASE_DIR}" + tar -czvf "${PLUGIN_NAME}-${PLUGIN_VERSION}.tgz" "./${PLUGIN_BASE_DIR}" + + echo "Built archives for package ${PLUGIN_NAME}-${PLUGIN_VERSION} at $(pwd)" + cd "$CURDIR" + done +} + upload_raw_file() { @@ -280,6 +314,10 @@ upload_raw_file() OUTPUT_FILE_TYPE='text/x-shellscript' elif [ "$EXT" == 'gz' ]; then OUTPUT_FILE_TYPE='application/gzip' + elif [ "$EXT" == 'tgz' ]; then + OUTPUT_FILE_TYPE='application/gzip' + elif [ "$EXT" == 'zip' ]; then + OUTPUT_FILE_TYPE='application/zip' elif [ "$EXT" == 'wgn' ]; then OUTPUT_FILE_TYPE='application/gzip' else @@ -294,17 +332,13 @@ upload_raw_file() else PROJECT_NAME=${FQDN} fi - if [ "$MVN_DEPLOYMENT_TYPE" == 'SNAPSHOT' ]; then - SEND_TO="${REPO}/${PROJECT_NAME}/snapshots" - elif [ "$MVN_DEPLOYMENT_TYPE" == 'STAGING' ]; then - SEND_TO="${REPO}/${PROJECT_NAME}/releases" + + if [ -z "$RELEASE_TAG" ]; then + SEND_TO="${REPO}/${PROJECT_NAME}" else - echo "Unreconfnized deployment type, quit" - exit + SEND_TO="${REPO}/${PROJECT_NAME}/${RELEASE_TAG}" fi - #if [ ! -z "$MVN_PROJECT_MODULEID" ]; then - # SEND_TO="$SEND_TO/$MVN_PROJECT_MODULEID" - #fi + if [ ! -z "$2" ]; then SEND_TO="$SEND_TO/$2" fi @@ -314,7 +348,36 @@ upload_raw_file() curl -vkn --netrc-file "${NETRC}" --upload-file "${OUTPUT_FILE}" -X PUT -H "Content-Type: $OUTPUT_FILE_TYPE" "${SEND_TO}/${OUTPUT_FILE}" } +upload_wagon_archives() +{ + SETUPFILES=$(find "$(pwd)" -name "setup.py") + CURDIR=$(pwd) + for SETUPFILE in $SETUPFILES; do + PLUGIN_FULL_DIR=$(dirname "$SETUPFILE") + PLUGIN_BASE_DIR=$(basename "$PLUGIN_FULL_DIR") + PLUGIN_NAME=$(grep 'name' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g') + PLUGIN_VERSION=$(grep 'version' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9\.]*//g') + + cd "${PLUGIN_FULL_DIR}"/.. + echo "In $(pwd), upload zip archive for $PLUGIN_NAME, version $PLUGIN_VERSION" + ARCHIVE_FILE_NAME="${PLUGIN_NAME}-${PLUGIN_VERSION}.zip" + if [ -z "$ARCHIVE_FILE_NAME" ]; then + echo "!!! No zip archive file found ${ARCHIVE_FILE_NAME}" + exit -1 + fi + upload_raw_file "${ARCHIVE_FILE_NAME}" "${PLUGIN_NAME}/${PLUGIN_VERSION}" + echo "In $(pwd), upload tgz archive for $PLUGIN_NAME, version $PLUGIN_VERSION" + ARCHIVE_FILE_NAME="${PLUGIN_NAME}-${PLUGIN_VERSION}.tgz" + if [ -z "$ARCHIVE_FILE_NAME" ]; then + echo "!!! No tgz archive file found ${ARCHIVE_FILE_NAME}" + exit -1 + fi + upload_raw_file "${ARCHIVE_FILE_NAME}" "${PLUGIN_NAME}/${PLUGIN_VERSION}" + + cd "${CURDIR}" + done +} upload_wagons_and_type_yamls() { @@ -341,19 +404,18 @@ upload_wagons_and_type_yamls() cp -f "$TYPEFILE_NAME" "$NEWFILENAME" fi - TYPEFILE_PACKAGE_VERSION=$(grep -R 'package_version' $TYPEFILE_NAME |cut -f2 -d ':' |sed -r 's/\s+//g') - WAGONFILE_NAME=$(ls -1 $PLUGIN_NAME-$TYPEFILE_PACKAGE_VERSION-*.wgn) + TYPEFILE_PACKAGE_VERSION=$(grep -R 'package_version' "$TYPEFILE_NAME" |cut -f2 -d ':' |sed -r 's/\s+//g') + WAGONFILE_NAME=$(ls -1 "${PLUGIN_NAME}"-"${TYPEFILE_PACKAGE_VERSION}"-*.wgn) if [ -z "$WAGONFILE_NAME" ]; then echo "!!! No wagonfile found with matching package name and version as required in typefile: " echo " $TYPEFILE_NAME plugin $PLUGIN_NAME package version ${TYPEFILE_PACKAGE_VERSION}" exit -1 fi - upload_raw_file "$NEWFILENAME" type_files/${PLUGIN_NAME}/${PLUGIN_VERSION_MAJOR} - upload_raw_file "$NEWFILENAME" type_files/${PLUGIN_NAME}/${PLUGIN_VERSION_MAJOR_MINOR} - upload_raw_file "${WAGONFILE_NAME}" "plugins/${PLUGIN_NAME}" + upload_raw_file "${NEWFILENAME}" "${PLUGIN_NAME}/${PLUGIN_VERSION}" + upload_raw_file "${WAGONFILE_NAME}" "${PLUGIN_NAME}/${PLUGIN_VERSION}" - rm -r $WAGONFILE_NAME + rm -r "$WAGONFILE_NAME" if [ "$TYPEFILE_NAME" != "$NEWFILENAME" ]; then rm -f "$NEWFILENAME" fi @@ -367,6 +429,13 @@ upload_files_of_extension() upload_raw_file "$F" "$2" done } +upload_files_of_extension_recursively() +{ + FILES=$(find . -name "*.$1") + for F in $FILES ; do + upload_raw_file "$F" "$2" + done +} generate_pypirc_then_publish() @@ -398,9 +467,22 @@ EOL +# following the https://wiki.onap.org/display/DW/Independent+Versioning+and+Release+Process +#IndependentVersioningandReleaseProcess-StandardizedDockerTagging build_and_push_docker() { - IMAGENAME="onap/${FQDN}.${MVN_PROJECT_MODULEID}" + # Old tagging + #IMAGENAME="onap/${FQDN}.${MVN_PROJECT_MODULEID}" + # new tagging + ENDID=$(echo $FQDN | rev | cut -f1 -d '.' |rev) + if [ "$ENDID" == "${MVN_PROJECT_MODULEID}" ]; then + #IMAGENAME="onap/${FQDN/org.onap./}" + IMAGENAME="onap/${FQDN}" + else + #IMAGENAME="onap/${FQDN/org.onap./}.${MVN_PROJECT_MODULEID}" + IMAGENAME="onap/${FQDN}.${MVN_PROJECT_MODULEID}" + fi + IMAGENAME=$(echo "$IMAGENAME" | sed -e 's/_*$//g' -e 's/\.*$//g') IMAGENAME=$(echo "$IMAGENAME" | tr '[:upper:]' '[:lower:]') @@ -408,16 +490,16 @@ build_and_push_docker() VERSION="${MVN_PROJECT_VERSION//[^0-9.]/}" VERSION2=$(echo "$VERSION" | cut -f1-2 -d'.') - LFQI="${IMAGENAME}:${VERSION}-${TIMESTAMP}" + LFQI="${IMAGENAME}:${VERSION}-${TIMESTAMP}"Z # build a docker image docker build --rm -f ./Dockerfile -t "${LFQI}" ./ + # all local builds push to SNAPSHOT repo REPO="" if [ $MVN_DEPLOYMENT_TYPE == "SNAPSHOT" ]; then - REPO=$MVN_DOCKERREGISTRY_SNASHOT + REPO=$MVN_DOCKERREGISTRY_SNAPSHOT elif [ $MVN_DEPLOYMENT_TYPE == "STAGING" ]; then - # there seems to be no staging docker registry? set to use SNAPSHOT also - REPO=$MVN_DOCKERREGISTRY_RELEASE + REPO=$MVN_DOCKERREGISTRY_SNAPSHOT else echo "Fail to determine DEPLOYMENT_TYPE" REPO=$MVN_DOCKERREGISTRY_SNAPSHOT @@ -437,19 +519,14 @@ build_and_push_docker() echo docker login "$REPO" -u "$USER" -p "$PASS_PROVIDED" docker login "$REPO" -u "$USER" -p "$PASS" - if [ $MVN_DEPLOYMENT_TYPE == "SNAPSHOT" ]; then - REPO="$REPO/snapshots" - elif [ $MVN_DEPLOYMENT_TYPE == "STAGING" ]; then - # there seems to be no staging docker registry? set to use SNAPSHOT also - #REPO=$MVN_DOCKERREGISTRY_RELEASE - REPO="$REPO" - else - echo "Fail to determine DEPLOYMENT_TYPE" - REPO="$REPO/unknown" - fi - - OLDTAG="${LFQI}" - PUSHTAGS="${REPO}/${IMAGENAME}:${VERSION2}-${TIMESTAMP} ${REPO}/${IMAGENAME}:${VERSION2} ${REPO}/${IMAGENAME}:${VERSION2}-latest" + # local tag is imagename:version-timestamp + OLDTAG="${LFQI}" + # three tags are pushed: + # {imagename}:{semver}-SNAPSHOT-{timestamp}Z this is what CIMAN-132 asks + # {imagename}:{semver} latest of current version, for testing + # {imagename}:latest latest of all, used mainly by csit + # LFQI="${IMAGENAME}:${VERSION}-${TIMESTAMP}"Z + PUSHTAGS="${REPO}/${IMAGENAME}:${VERSION}-SNAPSHOT-${TIMESTAMP}Z ${REPO}/${IMAGENAME}:${VERSION} ${REPO}/${IMAGENAME}:latest" for NEWTAG in ${PUSHTAGS} do echo "tagging ${OLDTAG} to ${NEWTAG}" @@ -459,8 +536,4 @@ build_and_push_docker() OLDTAG="${NEWTAG}" done fi - } - - - diff --git a/scripts/pom.xml b/scripts/pom.xml index 12e71fb..4ff29df 100644 --- a/scripts/pom.xml +++ b/scripts/pom.xml @@ -45,7 +45,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <sonar.language>py</sonar.language> <sonar.pluginName>Python</sonar.pluginName> <sonar.inclusions>**/*.py</sonar.inclusions> - <sonar.exclusions>tests/*</sonar.exclusions> + <sonar.exclusions>tests/*,setup.py</sonar.exclusions> <sonar.host.url>http://135.205.228.63:9000</sonar.host.url> </properties> <build> |