Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Use double bracket conditional compound command"
[releng/global-jjb.git]
/
shell
/
release-job.sh
diff --git
a/shell/release-job.sh
b/shell/release-job.sh
index
3a0294e
..
3ad4530
100644
(file)
--- a/
shell/release-job.sh
+++ b/
shell/release-job.sh
@@
-218,7
+218,7
@@
verify_schema(){
verify_version(){
# Verify allowed patterns "#.#.#" (SemVer) or "v#.#.#"
echo "INFO: Verifying version $VERSION"
verify_version(){
# Verify allowed patterns "#.#.#" (SemVer) or "v#.#.#"
echo "INFO: Verifying version $VERSION"
- allowed_version_regex="^
((v?)([0-9]+)\.([0-9]+)\.([0-9]+))
$"
+ allowed_version_regex="^
[vV]?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(\-(0|[1-9][0-9]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*)(\.(0|[1-9][0-9]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*))*)?(\+[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?
$"
if [[ $VERSION =~ $allowed_version_regex ]]; then
echo "INFO: The version $VERSION is valid"
else
if [[ $VERSION =~ $allowed_version_regex ]]; then
echo "INFO: The version $VERSION is valid"
else
@@
-335,6
+335,7
@@
nexus_release(){
container_release_file(){
echo "INFO: Processing container release"
container_release_file(){
echo "INFO: Processing container release"
+ docker --version
local lfn_umbrella
lfn_umbrella="$(echo "$GERRIT_URL" | awk -F"." '{print $2}')"
local lfn_umbrella
lfn_umbrella="$(echo "$GERRIT_URL" | awk -F"." '{print $2}')"