fix idnent

.gitlab-ci.yml

@@ -4,18 +4,18 @@ stages:
 
 build:
         stage: check
-        image: registry.gitlab.com/wolutator/base-build-env:latest
+        image: registry.hottis.de/dockerized/base-build-env:latest
         tags:
                 - hottis
                 - linux
                 - docker
         script:
                 - for I in *.py; do python -m py_compile $I; done
-                - for I in *.py; do python -m pycodestyle --max-line-length=120 $I; done
+                - for I in *.py; do python -m pycodestyle --ignore=E501 $I; done
 
 release:
         stage: release
-        image: registry.gitlab.com/wolutator/base-build-env
+        image: registry.hottis.de/dockerized/base-build-env:latest
         tags:
                 - hottis
                 - linux
@@ -23,7 +23,7 @@ release:
         only:
                 - release
         script:
-                - zip GitlabReleaseTool.zip gitlabreleaseuploader.py deleterelease.py
+                - zip GitlabReleaseTool.zip gitlabreleaseuploader.py deleterelease.py checksemver.py
-                - python gitlabreleaseuploader.py -p $PRIVATE_TOKEN -i $CI_PROJECT_ID -u $CI_PROJECT_URL
+                - python gitlabreleaseuploader.py -p $PRIVATE_TOKEN -i $CI_PROJECT_ID -u $CI_PROJECT_URL -I $CI_SERVER_URL
                   -f GitlabReleaseTool.zip -F info.json -T $CI_COMMIT_REF_NAME
 

checksemver.py

@@ -0,0 +1,80 @@
+#!/usr/bin/python
+
+import re
+import argparse
+import sys
+
+parser = argparse.ArgumentParser(description='Semantic Version Validator')
+parser.add_argument('--versionToValidate', '-V',
+                    help='The version to validate against the semantic versioning rules',
+                    required=True)
+parser.add_argument('--messageToValidate', '-M',
+                    help='A message to validate, means: it must not be empty',
+                    default='',
+                    required=False)
+parser.add_argument('--validateMessage', '-m',
+                    help='Consider -M',
+                    required=False,
+                    action='store_true',
+                    default=False)
+parser.add_argument('--printExports', '-e',
+                    help='Print exports',
+                    action='store_true',
+                    default=False,
+                    required=False)
+parser.add_argument('--exportFormat', '-f',
+                    help='Print exports in >bash< or >powershell< format, to be used in '
+                         'backticks or with Invoke-Expression',
+                    default='bash',
+                    required=False)
+parser.add_argument('--verbose', '-v',
+                    help='Verbose output, overrides -q',
+                    required=False,
+                    action='store_true',
+                    default=False)
+args = parser.parse_args()
+
+verbose = args.verbose
+versionToValidate = args.versionToValidate
+messageToValidate = args.messageToValidate
+validateMessage = args.validateMessage
+printExports = args.printExports
+exportFormat = args.exportFormat
+
+r = re.compile(r'^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$')
+
+if verbose:
+    print("Version to validate: {}".format(versionToValidate))
+
+m = r.match(versionToValidate)
+
+if m:
+    if verbose:
+        for i in r.groupindex:
+            print("Found: {}: {}".format(i, m.group(i)))
+    if validateMessage:
+        if verbose:
+            print("Checking message {}".format(messageToValidate))
+        if messageToValidate == '':
+            if verbose:
+                print("Message shall be validate and is invalid")
+            sys.exit(1)
+        else:
+            if printExports:
+                if exportFormat == "bash":
+                    print("export MESSAGE={}".format(messageToValidate))
+                elif exportFormat == "powershell":
+                    print("set MESSAGE {}".format(messageToValidate))
+
+    if printExports:
+        for i in r.groupindex:
+            if exportFormat == "bash":
+                print("export {}={}".format(i.upper(), '' if m.group(i) is None else m.group(i)))
+            elif exportFormat == "powershell":
+                print("set {} {}".format(i.upper(), '""' if m.group(i) is None else m.group(i)))
+
+    sys.exit(0)
+else:
+    if verbose:
+        print("Version is invalid")
+    sys.exit(1)

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,21 +98,26 @@ if releaseDescription == '':
 # --- upload the file
 uploadUrl = "%s/api/v4/projects/%s/uploads" % (instanceUrl, projectId)
 headers = {"PRIVATE-TOKEN": privateToken}
-files = {"file": open(fileToUpload, 'rb')}
 
-uploadResult = requests.post(uploadUrl, files=files, headers=headers, verify=caBundle)
+assets = []
+for filename in filesToUpload:
+    with open(filename, 'rb') as filehandle:
+        files = {"file": filehandle}
 
-if uploadResult.status_code != 201:
+        uploadResult = requests.post(uploadUrl, files=files, headers=headers, verify=caBundle)
-    print(uploadResult)
-    print(uploadResult.text)
-    raise Exception('Unable to upload file to Gitlab')
 
-if verbose:
+        if uploadResult.status_code != 201:
-    print(uploadResult)
+            print(uploadResult)
-    print(uploadResult.text)
+            print(uploadResult.text)
-print('File successfully uploaded')
+            raise Exception('Unable to upload file to Gitlab')
 
-uploadResultJson = json.loads(uploadResult.text)
+        if verbose:
+            print(uploadResult)
+            print(uploadResult.text)
+        print('File {} successfully uploaded'.format(filename))
+
+        url = projectUrl + json.loads(uploadResult.text)['url']
+        assets.append({'name': filename, 'url': url})
 
 # --- create release tag
 if createReleaseTag:
@@ -145,20 +152,14 @@ 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,
+    "name": releaseName,
-  "tag_name": releaseTag,
+    "tag_name": releaseTag,
-  "description": releaseDescription,
+    "description": releaseDescription,
-  "assets": {
+    "assets": {
-    "links": [
+        "links": assets
-      {
+    }
-        "name": fileToUpload,
-        "url": fullUrl
-      }
-    ]
-  }
 }
 
 createReleaseResult = requests.post(createReleaseUrl, headers=headers,

info.json

@@ -1,7 +1,7 @@
 {
-  "releaseTag": "v1.8",
+  "releaseTag": "v1.11",
   "createReleaseTag": "true",
-  "releaseName": "CA Bundle",
+  "releaseName": "semantic version validator added",
-  "description": "Option to provide CA bundle file for ssl verification"
+  "description": "semantic version validator added"
 }