From: Lusheng Ji Date: Wed, 6 Sep 2017 19:38:42 +0000 (+0000) Subject: Expand templates for blueprints X-Git-Tag: 1.0.0-Amsterdam~66 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F31%2F10631%2F1;p=dcaegen2%2Fplatform%2Fblueprints.git Expand templates for blueprints Issue-Id: DCAEGEN2-60 Change-Id: I22f8576b8e85ebe2fda6c245cc92d90bdb907cea Signed-off-by: Lusheng Ji --- diff --git a/blueprints/DeploymentHandler.yaml b/blueprints/DeploymentHandler.yaml index 9cf1cd9..d18ad61 100644 --- a/blueprints/DeploymentHandler.yaml +++ b/blueprints/DeploymentHandler.yaml @@ -27,8 +27,8 @@ description: > imports: - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml - - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/docker/2.1.0/node-type.yaml" - - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/relationship/1.0.0/node-type.yaml" + - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/docker/2.1.0/node-type.yaml" + - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/relationship/1.0.0/node-type.yaml" inputs: @@ -41,7 +41,7 @@ inputs: deployment_handler_image: description: Docker image for deployment handler - default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2 }}/org.onap.dcaegen2.platform/deployment-handler:1.0.0-SNAPSHOT' + default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/org.onap.dcaegen2.platform.deployment-handler:1.0' application_config: description: deployment handler application configuration (to override defaults) diff --git a/blueprints/cdapbp7.yaml b/blueprints/cdapbp7.yaml index 85b6e5c..cad5da2 100644 --- a/blueprints/cdapbp7.yaml +++ b/blueprints/cdapbp7.yaml @@ -22,8 +22,8 @@ imports: - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml - http://www.getcloudify.org/spec/openstack-plugin/1.4/plugin.yaml - http://www.getcloudify.org/spec/fabric-plugin/1.4.1/plugin.yaml - - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/dnsdesig/dns_types.yaml - - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/sshkeyshare/sshkey_types.yaml + - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/dnsdesig/dns_types.yaml + - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/sshkeyshare/sshkey_types.yaml inputs: centos7image_id: diff --git a/blueprints/pom.xml b/blueprints/pom.xml index dc921b3..b1cbcef 100644 --- a/blueprints/pom.xml +++ b/blueprints/pom.xml @@ -33,6 +33,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. UTF-8 + true . @@ -48,14 +49,11 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. **/*.js --> - ${project.artifactId}-${project.version} - - org.sonatype.plugins nexus-staging-maven-plugin @@ -73,68 +71,80 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. true - - - - org.apache.maven.plugins - maven-resources-plugin - 2.6 - - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - true - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - default-jar - - - - - - - - org.apache.maven.plugins - maven-install-plugin - 2.4 - - true - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - true - - - - + + + org.apache.maven.plugins + maven-resources-plugin + 2.6 + + true + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + true + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + default-jar + + + + + + + org.apache.maven.plugins + maven-install-plugin + 2.4 + + true + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12.4 + + true + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + ${session.executionRootDirectory}/mvn-phase-script.sh + + + ${parent.groupId} + ${parent.artifactId} + ${parent.version} + ${onap.nexus.url} + ${onap.nexus.rawrepo.baseurl.upload} + ${onap.nexus.rawrepo.baseurl.download} + ${onap.nexus.rawrepo.serverid} + ${onap.nexus.dockerregistry.daily} + ${onap.nexus.dockerregistry.release} + + + - - - org.codehaus.mojo @@ -165,147 +173,92 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. clean phase script clean - exec + + exec + - ${session.executionRootDirectory}/mvn-phase-script.sh ${project.artifactId} clean - - - ${project.groupId} - ${project.artifactId} - ${project.version} - ${onap.nexus.url} - - - generate-sources script generate-sources - exec + + exec + - mvn-phase-script.sh ${project.artifactId} generate-sources - - - ${project.groupId} - ${project.artifactId} - ${project.version} - ${onap.nexus.url} - - - compile script compile - exec + + exec + - mvn-phase-script.sh ${project.artifactId} compile - - - ${project.groupId} - ${project.artifactId} - ${project.version} - ${onap.nexus.url} - - - package script package - exec + + exec + - mvn-phase-script.sh ${project.artifactId} package - - - ${project.groupId} - ${project.artifactId} - ${project.version} - ${onap.nexus.url} - - - test script test - exec + + exec + - mvn-phase-script.sh ${project.artifactId} test - - - ${project.groupId} - ${project.artifactId} - ${project.version} - ${onap.nexus.url} - - - install script install - exec + + exec + - mvn-phase-script.sh ${project.artifactId} install - - - ${project.groupId} - ${project.artifactId} - ${project.version} - ${onap.nexus.url} - - - deploy script deploy - exec + + exec + - mvn-phase-script.sh ${project.artifactId} deploy - - - ${project.groupId} - ${project.artifactId} - ${project.version} - ${onap.nexus.url} - - diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh index a4d52d9..d0f1ebe 100755 --- a/mvn-phase-script.sh +++ b/mvn-phase-script.sh @@ -21,6 +21,33 @@ echo "running script: [$0] for module [$1] at stage [$2]" +MVN_PROJECT_MODULEID="$1" +MVN_PHASE="$2" + +echo "MVN_PROJECT_MODULEID is [$MVN_PROJECT_MODULEID]" +echo "MVN_PHASE is [$MVN_PHASE]" +echo "MVN_PROJECT_GROUPID is [$MVN_PROJECT_GROUPID]" +echo "MVN_PROJECT_ARTIFACTID is [$MVN_PROJECT_ARTIFACTID]" +echo "MVN_PROJECT_VERSION is [$MVN_PROJECT_VERSION]" +echo "MVN_NEXUSPROXY is [$MVN_NEXUSPROXY]" +echo "MVN_RAWREPO_BASEURL_UPLOAD is [$MVN_RAWREPO_BASEURL_UPLOAD]" +echo "MVN_RAWREPO_BASEURL_DOWNLOAD is [$MVN_RAWREPO_BASEURL_DOWNLOAD]" +MVN_RAWREPO_HOST=$(echo "$MVN_RAWREPO_BASEURL_UPLOAD" | cut -f3 -d'/' |cut -f1 -d':') +echo "MVN_RAWREPO_HOST is [$MVN_RAWREPO_HOST]" +echo "MVN_RAWREPO_SERVERID is [$MVN_RAWREPO_SERVERID]" +echo "MVN_DOCKERREGISTRY_DAILY is [$MVN_DOCKERREGISTRY_DAILY]" +echo "MVN_DOCKERREGISTRY_RELEASE is [$MVN_DOCKERREGISTRY_RELEASE]" + +if [[ "$MVN_PROJECT_VERSION" == *SNAPSHOT ]]; then + echo "=> for SNAPSHOT artifact build" + MVN_DEPLOYMENT_TYPE='SNAPSHOT' +else + echo "=> for STAGING/RELEASE artifact build" + MVN_DEPLOYMENT_TYPE='STAGING' +fi +echo "MVN_DEPLOYMENT_TYPE is [$DEPLOYMENT_TYPE]" + + echo "=> Prepare environment " #env @@ -32,10 +59,13 @@ if [ -z "${MVN_NEXUSPROXY}" ]; then echo "MVN_NEXUSPROXY environment variable not set. Cannot proceed" exit fi + MVN_NEXUSPROXY_HOST=$(echo "$MVN_NEXUSPROXY" |cut -f3 -d'/' | cut -f1 -d':') -echo "=> Nexu Proxy at $MVN_NEXUSPROXY_HOST, $MVN_NEXUSPROXY" +echo "=> Nexus Proxy at $MVN_NEXUSPROXY_HOST, $MVN_NEXUSPROXY" -# use the version text detect which phase we are in in LF CICD process: verify, merge, or (daily) release +if [ -z "$WORKSPACE" ]; then + WORKSPACE=$(pwd) +fi # mvn phase in life cycle MVN_PHASE="$2" @@ -43,6 +73,7 @@ MVN_PHASE="$2" case $MVN_PHASE in clean) echo "==> clean phase script" + rm -rf ./venv-tox ;; generate-sources) echo "==> generate-sources phase script" @@ -61,6 +92,155 @@ install) ;; deploy) echo "==> deploy phase script" + + # set up env variables, get ready for template resolution + export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.plugins/releases" + export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.plugins/snapshots" + export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_blueprints_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.blueprints/releases" + export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_blueprints_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.blueprints/snapshots" + 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" + + export ONAPTEMPLATE_PYPIURL_org_onap_dcaegen2="${MVN_NEXUSPROXY}/content/sites/pypi" + + export ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases="$MVN_DOCKERREGISTRY_DAILY" + export ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_snapshots="$MVN_DOCKERREGISTRY_DAILY/snapshots" + + + TEMPLATES=$(env |grep ONAPTEMPLATE) + echo "====> Resolving the following temaplate from environment variables " + echo "[$TEMPLATES]" + SELFFILE=$(echo $0 | rev | cut -f1 -d '/' | rev) + for TEMPLATE in $TEMPLATES; do + KEY=$(echo $TEMPLATE | cut -f1 -d'=') + VALUE=$(echo $TEMPLATE | cut -f2 -d'=') + VALUE2=$(echo $TEMPLATE | cut -f2 -d'=' |sed 's/\//\\\//g') + FILES=$(grep -rl "$KEY") + + # assuming FILES is not longer than 2M bytes, the limit for variable value max size on this VM + for F in $FILES; do + if [[ $F == *"$SELFFILE" ]]; then + continue + fi + echo "======> Resolving template $KEY to value $VALUE for file $F" + sed -i "s/{{[[:space:]]*$KEY[[:space:]]*}}/$VALUE2/g" $F + + cat $F + done + + #if [ ! -z "$FILES" ]; then + # echo "====> Resolving template $VALUE to value $VALUE" + # #CMD="grep -rl \"$VALUE\" | tr '\n' '\0' | xargs -0 sed -i \"s/{{[[:space:]]*$VALUE[[:space:]]*}}/$VALUE/g\"" + # grep -rl "$KEY" | tr '\n' '\0' | xargs -0 sed -i 's/$KEY/$VALUE2/g' + # #echo $CMD + # #eval $CMD + #fi + done + echo "====> Done template reolving" + + + FQDN="${MVN_PROJECT_GROUPID}.${MVN_PROJECT_ARTIFACTID}" + if [ "$MVN_PROJECT_MODULEID" == "__" ]; then + MVN_PROJECT_MODULEID="" + fi + + # Extract the username and password to the nexus repo from the settings file + USER=$(xpath -q -e "//servers/server[id='$MVN_RAWREPO_SERVERID']/username/text()" "$SETTINGS_FILE") + PASS=$(xpath -q -e "//servers/server[id='$MVN_RAWREPO_SERVERID']/password/text()" "$SETTINGS_FILE") + NETRC=$(mktemp) + echo "machine $MVN_RAWREPO_HOST login $USER password $PASS" > "$NETRC" + + REPO="$MVN_RAWREPO_BASEURL_UPLOAD" + FQDN="${MVN_PROJECT_GROUPID}.${MVN_PROJECT_ARTIFACTID}" + + OUTPUT_FILES="*.yaml" + + if [ "$MVN_DEPLOYMENT_TYPE" == 'SNAPSHOT' ]; then + SEND_TO="${REPO}/${FQDN}/snapshots" + elif [ "$MVN_DEPLOYMENT_TYPE" == 'STAGING' ]; then + SEND_TO="${REPO}/${FQDN}/releases" + else + echo "Unreconfnized deployment type, quit" + exit + fi + + echo "Sending ${OUTPUT_FILE} to Nexus: ${SEND_TO}" + for OUTPUT_FILE in $OUTPUT_FILES; do + echo curl -vkn --netrc-file "${NETRC}" --upload-file "${OUTPUT_FILE}" "${SEND_TO}/${OUTPUT_FILE}" + curl -vkn --netrc-file "${NETRC}" --upload-file "${OUTPUT_FILE}" "${SEND_TO}/${OUTPUT_FILE}-${MVN_PROJECT_VERSION}-${TIMESTAMP}" + curl -vkn --netrc-file "${NETRC}" --upload-file "${OUTPUT_FILE}" "${SEND_TO}/${OUTPUT_FILE}" + done + # ========================== end of example deploying raw artifact ======================== + +if false; then + # ================== example building and deploying docker image ========================== + IMAGENAME="onap/${FQDN}.${MVN_PROJECT_MODULEID}" + IMAGENAME=$(echo "$IMAGENAME" | sed -e 's/_*$//g' -e 's/\.*$//g') + + # use the major and minor version of the MVN artifact version as docker image version + VERSION="${MVN_PROJECT_VERSION//[^0-9.]/}" + VERSION2=$(echo "$VERSION" | cut -f1-2 -d'.') + + LFQI="${IMAGENAME}:${VERSION}-${TIMESTAMP}" + BUILD_PATH="${WORKSPACE}" + # build a docker image + docker build --rm -f "${WORKSPACE}"/Dockerfile -t "${LFQI}" "${BUILD_PATH}" + + REPO="" + if [ $MVN_DEPLOYMENT_TYPE == "SNAPSHOT" ]; then + REPO=$MVN_DOCKERREGISTRY_DAILY + 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_DAILY + else + echo "Fail to determine DEPLOYMENT_TYPE" + REPO=$MVN_DOCKERREGISTRY_DAILY + fi + echo "DEPLOYMENT_TYPE is: $MVN_DEPLOYMENT_TYPE, repo is $REPO" + + if [ ! -z "$REPO" ]; then + USER=$(xpath -e "//servers/server[id='$REPO']/username/text()" "$SETTINGS_FILE") + PASS=$(xpath -e "//servers/server[id='$REPO']/password/text()" "$SETTINGS_FILE") + if [ -z "$USER" ]; then + echo "Error: no user provided" + fi + if [ -z "$PASS" ]; then + echo "Error: no password provided" + fi + [ -z "$PASS" ] && PASS_PROVIDED="" || PASS_PROVIDED="" + 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" + for NEWTAG in ${PUSHTAGS} + do + echo "tagging ${OLDTAG} to ${NEWTAG}" + docker tag "${OLDTAG}" "${NEWTAG}" + echo "pushing ${NEWTAG}" + docker push "${NEWTAG}" + OLDTAG="${NEWTAG}" + done + fi +fi + # ============= end of example building and deploying docker image ======================== ;; *) echo "==> unprocessed phase"