second fix

deleterelease.py

@@ -26,6 +26,12 @@ parser.add_argument('--verbose', '-v',
 parser.add_argument('--caBundle', '-B',
                     help='File with the CA certificates to trust', required=False,
                     default='/etc/ssl/certs/ca-certificates.crt')
+parser.add_argument('--insecure',
+                    help='insecure ssl connect',
+                    required=False,
+                    action='store_true',
+                    default=False)
+
 
 args = parser.parse_args()
 
@@ -35,6 +41,7 @@ releaseTag = args.releaseTag
 instanceUrl = args.instanceUrl
 verbose = args.verbose
 caBundle = args.caBundle
+insecure = args.insecure
 
 # --- delete release
 deleteReleaseUrl = "%s/api/v4/projects/%s/releases/%s" % (instanceUrl, projectId, releaseTag)
@@ -43,6 +50,9 @@ headers = {"PRIVATE-TOKEN": privateToken, "Content-Type": "application/json"}
 if verbose:
     print("URL: %s" % deleteReleaseUrl)
 
+if insecure:
+    caBundle = (False)
+
 deleteReleaseResult = requests.delete(deleteReleaseUrl, headers=headers, verify=caBundle)
 
 if deleteReleaseResult.status_code != 200:

gitlabreleaseuploader.py

@@ -14,7 +14,9 @@ parser.add_argument('--projectId', '-i',
 parser.add_argument('--projectUrl', '-u',
                     help='URL of the related project at Gitlab', required=True)
 parser.add_argument('--file', '-f',
-                    help='File to be released', required=True)
+                    help='File to be released, can appear multiple times',
+                    action='append',
+                    required=True)
 parser.add_argument('--releaseName', '-n',
                     help='Name of the release', required=False,
                     default='')
@@ -55,7 +57,7 @@ args = parser.parse_args()
 privateToken = args.privateToken
 projectId = args.projectId
 projectUrl = args.projectUrl
-fileToUpload = args.file
+filesToUpload = args.file
 releaseName = args.releaseName
 releaseTag = args.releaseTag
 releaseTagTarget = args.releaseTagTarget
@@ -96,7 +98,11 @@ if releaseDescription == '':
 # --- upload the file
 uploadUrl = "%s/api/v4/projects/%s/uploads" % (instanceUrl, projectId)
 headers = {"PRIVATE-TOKEN": privateToken}
-files = {"file": open(fileToUpload, 'rb')}
+
+assets = []
+for filename in filesToUpload:
+    with open(filename, 'rb') as filehandle:
+        files = {"file": filehandle}
 
         uploadResult = requests.post(uploadUrl, files=files, headers=headers, verify=caBundle)
 
@@ -108,9 +114,10 @@ if uploadResult.status_code != 201:
         if verbose:
             print(uploadResult)
             print(uploadResult.text)
-print('File successfully uploaded')
+        print('File {} successfully uploaded'.format(filename))
 
-uploadResultJson = json.loads(uploadResult.text)
+        url = projectUrl + json.loads(uploadResult.text)['url']
+        assets.append({'name': filename, 'url': url})
 
 # --- create release tag
 if createReleaseTag:
@@ -145,19 +152,13 @@ if createReleaseTag:
 # --- create release
 createReleaseUrl = "%s/api/v4/projects/%s/releases" % (instanceUrl, projectId)
 headers = {"PRIVATE-TOKEN": privateToken, "Content-Type": "application/json"}
-fullUrl = projectUrl + uploadResultJson['url']
 
 payloadCreateRelease = {
   "name": releaseName,
   "tag_name": releaseTag,
   "description": releaseDescription,
   "assets": {
-    "links": [
+    "links": assets
-      {
-        "name": fileToUpload,
-        "url": fullUrl
-      }
-    ]
   }
 }
 

info.json

@@ -1,7 +1,7 @@
 {
-  "releaseTag": "v1.8",
+  "releaseTag": "v1.10c",
   "createReleaseTag": "true",
-  "releaseName": "CA Bundle",
+  "releaseName": "re-add insecure, second fix",
-  "description": "Option to provide CA bundle file for ssl verification"
+  "description": "re-add insecure option to deleterelease script, second fix"
 }