From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 23 Jan 2025 14:55:00 +0000 (+0100)
Subject: Add user option to artifactory cleanup tools and fix typo
X-Git-Tag: v18.0.0~85
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F93%2F14893%2F1;p=osm%2Fdevops.git

Add user option to artifactory cleanup tools and fix typo

Change-Id: I35e24b84ad1d5f5845b8f9598484ff09322bdc27
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

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