Merge pull request #32 from Axway/APIGOV-00000

Apigov 00000

.gitlab-ci.yml

@@ -14,8 +14,6 @@ variables:
   WS_PROJECT_ID: "agents-webmethods"
   WS_CONFIG_FILE: "whitesource.config"
 
-  GIT_TAG_PREFIX: v
-
   # just to be sure we don't do vendoring
   GOFLAGS: "-mod=mod"
 
@@ -53,7 +51,7 @@ include:
 
 .get-latest-tag: &get-latest-tag |
   if [ $(git --version | grep -Eo '2.*') ]; then 
-    export LATEST_TAG=$(git tag -l --sort="version:refname" | grep -Eo '[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,3}$' | tail -1)
+    export LATEST_TAG=$(git tag -l --sort="version:refname" | grep -Eo '^v?[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}(-.*)?$' | grep -ve '-rc\.[0-9]\+$' | grep -ve '-[0-9]\+$' | tail -1)
   else 
     export LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
   fi
@@ -84,7 +82,7 @@ twistlock-discovery:on-schedule:
   before_script:
     - apk --no-cache update && apk add git
     - *get-latest-tag
-    - export IMAGE_NAME=ghcr.io/axway/webmethods_discovery_agent:${GIT_TAG_PREFIX}${LATEST_TAG}
+    - export IMAGE_NAME=ghcr.io/axway/webmethods_discovery_agent:${LATEST_TAG}
     - docker pull ${IMAGE_NAME}
 
 # twistlock-traceability:on-schedule:
@@ -95,7 +93,7 @@ twistlock-discovery:on-schedule:
 #   before_script:
 #     - apk --no-cache update && apk add git
 #     - *get-latest-tag
-#     - export IMAGE_NAME=ghcr.io/axway/webmethods_traceability_agent:${GIT_TAG_PREFIX}${LATEST_TAG}
+#     - export IMAGE_NAME=ghcr.io/axway/webmethods_traceability_agent:${LATEST_TAG}
 #     - docker pull ${IMAGE_NAME}
 
 whitesource:on-schedule:
@@ -107,8 +105,8 @@ whitesource:on-schedule:
     - git config --global url."ssh://[email protected]".insteadOf "https://git.ecd.axway.org"''
     - git fetch
     - *get-latest-tag
-    - echo "Checking out ${GIT_TAG_PREFIX}${LATEST_TAG}"
-    - git checkout ${GIT_TAG_PREFIX}${LATEST_TAG}
+    - echo "Checking out ${LATEST_TAG}"
+    - git checkout ${LATEST_TAG}
 
 # overridden from csrjobs.yml because mirror repos like this one don't get merge events 
 fortify: