diff options
| author |   Tony Hansen <tony@att.com> | 2017-10-24 16:37:30 +0000 |
|---|---|---|
| committer | Tony Hansen <tony@att.com> | 2017-10-24 19:09:36 +0000 |
| commit | c24f03065f4e8e13490f49433a0baa2d5fbca304 (patch) | |
| tree | 16611514546ce059b4a7fd85c4080a1fb35473f6 | |
| parent | 64c939dbb9ac098734d43bf7e78827eb6df98d97 (diff) | |
test another fix for curl upload commands
fixed the MVN_SERVER_ID variable used to extract values from the settings.xml
file to be MVN_RAWREPO_SERVERID with a backup value of ecomp-raw.
Change-Id: Ia8b2bc2bc3c8c969e9e22847c2076985f2c83fe5
Signed-off-by: Tony Hansen <tony@att.com>
Issue-ID: CCSDK-128
Signed-off-by: Tony Hansen <tony@att.com>
| -rw-r--r-- | makefile | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -49,20 +49,17 @@ deploy: rm -f $$HOME/.netrc ; \ REPO=$$MVN_NEXUSPROXY/content/sites/raw/$$MVN_PROJECT_GROUPID ; \ hostport=$$(echo $$REPO | cut -f3 -d /) ; \ - host=$$(echo $$hostport | cut -f1 -d:) ; \ + host=$$(echo $$hostport | cut -f1 -d:) ; set -x ; env ; \ settings=$${SETTINGS_FILE:-$$HOME/.m2/settings.xml} ; \ - echo machine $$host login $$(xpath -q -e "//servers/server[id='$$MVN_SERVER_ID']/username/text()" $$settings) password $$(xpath -q -e "//servers/server[id='$$MVN_SERVER_ID']/password/text()" $$settings) >$$HOME/.netrc ; \ - chmod 600 $$HOME/.netrc ; \ + serverid=$${MVN_RAWREPO_SERVERID:-ecomp-raw} ; \ + echo machine $$host login $$(xpath -q -e "//servers/server[id='$$serverid']/username/text()" $$settings) password $$(xpath -q -e "//servers/server[id='$$serverid']/password/text()" $$settings) >$$HOME/.netrc ; \ + chmod 600 $$HOME/.netrc ; cat $$HOME/.netrc ; \ case "$$MVN_PROJECT_VERSION" in *SNAPSHOT ) export subdir=snapshots SNAPSHOT=-SNAPSHOT ;; * ) export subdir=releases SNAPSHOT= ;; esac ; \ export MVN_VERSION_ONLY=$${MVN_PROJECT_VERSION%%-SNAPSHOT} ; \ REPO=$$MVN_NEXUSPROXY/content/sites/raw/$$MVN_PROJECT_GROUPID/$$subdir/debs ; \ REPO2=$$MVN_NEXUSPROXY/content/sites/raw/$$MVN_PROJECT_GROUPID/debs ; \ - REPO3=$$MVN_NEXUSPROXY/content/sites/raw/$$MVN_PROJECT_GROUPID/plugins/pgaas ; \ - REPO4=$$MVN_NEXUSPROXY/content/sites/raw/$$MVN_PROJECT_GROUPID/plugins ; \ - export REPACKAGEDEBIANUPLOAD="set -x; curl -v -X PUT -H 'Content-Type:application/octet-stream' --netrc --upload-file '{0}' --url '$$REPO/{1}'" ; \ - export REPACKAGEDEBIANUPLOAD2="set -x; curl -v -X PUT -H 'Content-Type:application/octet-stream' --netrc --upload-file '{0}' --url '$$REPO2/{1}'" ; \ - export REPACKAGEDEBIANUPLOAD3="set -x; curl -v -X PUT -H 'Content-Type:application/octet-stream' --netrc --upload-file '{0}' --url '$$REPO3/{1}'" ; \ - export REPACKAGEDEBIANUPLOAD4="set -x; curl -v -X PUT -H 'Content-Type:application/octet-stream' --netrc --upload-file '{0}' --url '$$REPO4/{1}'" ; \ + export REPACKAGEDEBIANUPLOAD="set -x; curl -X PUT -H 'Content-Type:application/octet-stream' --netrc --upload-file '{0}' --url '$$REPO/{1}'" ; \ + export REPACKAGEDEBIANUPLOAD2="set -x; curl -X PUT -H 'Content-Type:application/octet-stream' --netrc --upload-file '{0}' --url '$$REPO2/{1}'" ; \ export PATH=$$PATH:$$(pwd)/bin; \ env | sort ; \ for i in $(STAGEDIRS); do ( cd $$i/src && $(MAKE) debian ) done |