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 "CI: Use the tox-verify workflow to test all envs"
[releng/global-jjb.git]
/
shell
/
maven-deploy.sh
diff --git
a/shell/maven-deploy.sh
b/shell/maven-deploy.sh
index
c30963b
..
5da6158
100644
(file)
--- a/
shell/maven-deploy.sh
+++ b/
shell/maven-deploy.sh
@@
-1,4
+1,4
@@
-#!/bin/bash
+#!/bin/bash
-l
# SPDX-License-Identifier: EPL-1.0
##############################################################################
# Copyright (c) 2017 The Linux Foundation and others.
# SPDX-License-Identifier: EPL-1.0
##############################################################################
# Copyright (c) 2017 The Linux Foundation and others.
@@
-13,6
+13,7
@@
# Requires the existance of $WORKSPACE/m2repo and $WORKSPACE/m2repo-backup to
# compare if maven metadata files have changed. Unchanged files are then
# removed from $WORKSPACE/m2repo before uploading to the snapshot repo.
# Requires the existance of $WORKSPACE/m2repo and $WORKSPACE/m2repo-backup to
# compare if maven metadata files have changed. Unchanged files are then
# removed from $WORKSPACE/m2repo before uploading to the snapshot repo.
+echo "---> maven-deploy.sh"
# Ensure we fail the job if any steps fail.
set -eu -o pipefail
# Ensure we fail the job if any steps fail.
set -eu -o pipefail
@@
-20,9
+21,7
@@
set -eu -o pipefail
m2repo_dir="$WORKSPACE/m2repo"
nexus_repo_url="$NEXUS_URL/content/repositories/$NEXUS_REPO"
m2repo_dir="$WORKSPACE/m2repo"
nexus_repo_url="$NEXUS_URL/content/repositories/$NEXUS_REPO"
-lftools_activate
-
-# Remove metadata files that were not updated.
+echo "-----> Remove metadata files that were not updated"
set +e # Temporarily disable to run diff command.
mapfile -t metadata_files <<< "$(diff -s -r "$m2repo_dir" "$WORKSPACE/m2repo-backup" \
| grep 'Files .* and .* are identical' \
set +e # Temporarily disable to run diff command.
mapfile -t metadata_files <<< "$(diff -s -r "$m2repo_dir" "$WORKSPACE/m2repo-backup" \
| grep 'Files .* and .* are identical' \
@@
-39,5
+38,12
@@
fi
set -u # Re-enable.
find "$m2repo_dir" -type d -empty -delete
set -u # Re-enable.
find "$m2repo_dir" -type d -empty -delete
-maven_metadata_validate "$m2repo_dir"
+
+echo "-----> Install lftools"
+# shellcheck disable=SC1090
+. ~/lf-env.sh
+
+lf-activate-venv --python python3 lftools
+
+echo "-----> Upload files to Nexus"
lftools deploy nexus -s "$nexus_repo_url" "$m2repo_dir"
lftools deploy nexus -s "$nexus_repo_url" "$m2repo_dir"