Code Review
/
policy
/
parent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add release script, fix sed for MacOS
[policy/parent.git]
/
integration
/
src
/
release_scripts
/
mkdock.sh
diff --git
a/integration/src/release_scripts/mkdock.sh
b/integration/src/release_scripts/mkdock.sh
index
dfbee9f
..
4f1b3e2
100755
(executable)
--- a/
integration/src/release_scripts/mkdock.sh
+++ b/
integration/src/release_scripts/mkdock.sh
@@
-39,6
+39,14
@@
set -e
set -e
+# Use the bash internal OSTYPE variable to check for MacOS
+if [[ "$OSTYPE" == "darwin"* ]]
+then
+ SED="gsed"
+else
+ SED="sed"
+fi
+
if [ $# -lt 1 -o "$1" = "-?" ]
then
echo "arg(s): docker-container-name1 docker-container-name2 ..." >&2
if [ $# -lt 1 -o "$1" = "-?" ]
then
echo "arg(s): docker-container-name1 docker-container-name2 ..." >&2
@@
-59,20
+67,20
@@
fi
echo Branch: ${BRANCH}
PROJECT=$(awk -F= '$1 == "project" { print $2 }' "${TOPDIR}/.gitreview" |
echo Branch: ${BRANCH}
PROJECT=$(awk -F= '$1 == "project" { print $2 }' "${TOPDIR}/.gitreview" |
-
sed
's/.git$//')
+
$SED
's/.git$//')
if [ -z "${PROJECT}" ]; then
echo "cannot extract project from ${TOPDIR}/.gitreview" >&2
exit 1
fi
echo Project: ${PROJECT}
if [ -z "${PROJECT}" ]; then
echo "cannot extract project from ${TOPDIR}/.gitreview" >&2
exit 1
fi
echo Project: ${PROJECT}
-TPROJ=$(echo ${PROJECT} |
sed
's!/!%2F!')
-DPROJ=$(echo ${PROJECT} |
sed
's!/!-!')
+TPROJ=$(echo ${PROJECT} |
$SED
's!/!%2F!')
+DPROJ=$(echo ${PROJECT} |
$SED
's!/!-!')
RELEASE=$(
xmllint --xpath \
'/*[local-name()="project"]/*[local-name()="version"]/text()' \
"${TOPDIR}/pom.xml" |
RELEASE=$(
xmllint --xpath \
'/*[local-name()="project"]/*[local-name()="version"]/text()' \
"${TOPDIR}/pom.xml" |
-
sed
's!-SNAPSHOT!!'
+
$SED
's!-SNAPSHOT!!'
)
if [ -z "${RELEASE}" ]; then
echo "cannot extract release from ${TOPDIR}/pom.xml" >&2
)
if [ -z "${RELEASE}" ]; then
echo "cannot extract release from ${TOPDIR}/pom.xml" >&2
@@
-91,7
+99,7
@@
prefix='https://jenkins.onap.org/view/policy/job/'
STAGE_ID=$(
curl --silent ${prefix}${DPROJ}-maven-docker-stage-${BRANCH}/ |
grep "Last completed build" |
STAGE_ID=$(
curl --silent ${prefix}${DPROJ}-maven-docker-stage-${BRANCH}/ |
grep "Last completed build" |
-
sed
-e 's!.*Last completed build .#!!' -e 's!).*!!' |
+
$SED
-e 's!.*Last completed build .#!!' -e 's!).*!!' |
head -1
)
if [ -z "${STAGE_ID}" ]; then
head -1
)
if [ -z "${STAGE_ID}" ]; then
@@
-129,7
+137,7
@@
do
found == 1 && /Tag with/ { print }
" |
head -1 |
found == 1 && /Tag with/ { print }
" |
head -1 |
-
sed
's!.*Tag with!!' |
+
$SED
's!.*Tag with!!' |
cut -d, -f2
)
if [ -z "${VERSION}" ]; then
cut -d, -f2
)
if [ -z "${VERSION}" ]; then