From dab1ac67daeca76f94d910ff0a767a38121fe42f Mon Sep 17 00:00:00 2001
From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 23 Jan 2025 15:55:00 +0100
Subject: [PATCH] Add user option to artifactory cleanup tools and fix typo
Change-Id: I35e24b84ad1d5f5845b8f9598484ff09322bdc27
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---
tools/cleanupBuilds.py | 3 ++-
tools/cleanupRepo.py | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/tools/cleanupBuilds.py b/tools/cleanupBuilds.py
index 4e6dfbcb..c924e8f9 100755
--- a/tools/cleanupBuilds.py
+++ b/tools/cleanupBuilds.py
@@ -27,6 +27,7 @@ import time
arg_parser = argparse.ArgumentParser(description="Tool to retrieve the latest build from the artifactory server")
arg_parser.add_argument('branch')
+arg_parser.add_argument('--user', default='admin')
arg_parser.add_argument('--project', default='osm-stage_3')
arg_parser.add_argument('--url', default='https://artifactory-osm.etsi.org/')
arg_parser.add_argument('--keep', default=5)
@@ -81,4 +82,4 @@ for entry in buildlist[int(args.keep):]:
print("deleting build {} ms {}".format(args.project + " :: " + args.branch + '/' + buildNumber, ms))
postData = buildPost(ms, entry['uri'].split('/')[1])
- requests.post(delete_url, data=json.dumps(postData), headers=headers, auth=('admin', args.password))
+ requests.post(delete_url, data=json.dumps(postData), headers=headers, auth=(args.user, args.password))
diff --git a/tools/cleanupRepo.py b/tools/cleanupRepo.py
index 997d6bf1..44ab6a19 100755
--- a/tools/cleanupRepo.py
+++ b/tools/cleanupRepo.py
@@ -28,8 +28,9 @@ import time
arg_parser=argparse.ArgumentParser(description="Tool to retrieve the latest build from the artifactory server")
arg_parser.add_argument('--branch',default=None)
arg_parser.add_argument('repo')
-arg_parser.add_argument('--url',default='https://artifactory-osm.etsi.org/)
+arg_parser.add_argument('--url',default='https://artifactory-osm.etsi.org/')
arg_parser.add_argument('--keep',default=5)
+arg_parser.add_argument('--user', default='admin')
arg_parser.add_argument('--password',default='')
arg_parser.add_argument('--debug',default=None)
@@ -59,7 +60,7 @@ for entry in folders_sorted[int(args.keep):]:
if args.debug:
print("going to delete {}".format(delete_url+entry['uri']))
else:
- requests.delete(delete_url + entry['uri'], auth=('admin',args.password))
+ requests.delete(delete_url + entry['uri'], auth=(args.user, args.password))
# empty the trash can
--
GitLab