OPS-8 Added job to create a release candidate (#16)

* OPS-8 Cleaned up things in lib-jira

* OPS-8 Added some debugging

* OPS-8 added more debug

* OPS-8 do less in job

* Fixed wrong URL

* Revert back to actual create release

* Adding JIRA tickets to release

* some debug

* some debug

* some debug

* Added missing kosli command

* added some debug

* More testing

* more debug

* Only get existing JIRA keys

* Revert back commented out code

* OPS-8 Updated apps

Author: ToreMerkely

.github/workflows/create-release.yml

@@ -8,6 +8,10 @@ env:
   KOSLI_ORG: kosli-public
   KOSLI_API_TOKEN: "${{ secrets.KOSLI_PUBLIC_API_TOKEN }}"
   KOSLI_CLI_VERSION: "2.11.8"
+  KOSLI_ENV_STAGING: "jira-integration-example-staging"
+  KOSLI_ENV_PROD: "jira-integration-example-prod"
+  KOSLI_FLOW_FRONTEND: "jira-example-frontend"
+  KOSLI_FLOW_BACKEND: "jira-example-backend"
   # KOSLI_DRY_RUN: true
   JIRA_BASE_URL: "https://kosli-team.atlassian.net"
   JIRA_USERNAME: ${{ secrets.KOSLI_JIRA_USERNAME }}
@@ -24,14 +28,33 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Setup Kosli cli
+        uses: kosli-dev/setup-cli-action@v2
+        with:
+          version:
+            ${{ env.KOSLI_CLI_VERSION }}
+
       - name:
-        run: |
-          set -x
+        run: |          
           source scripts/lib-jira.sh
-          current_release=$(get_current_release_candidate ${{ env.JIRA_PROJECT_ID }} | jq '.values')
-          if [ "${current_release}" != "[]" ]; then
-            echo "Release candidate already exist: ${current_release}"
+          source scripts/lib-kosli.sh
+
+          # Fail if release already exists
+          CURRENT_REL_JSON=$(get_CURRENT_REL_candidate ${{ env.JIRA_PROJECT_ID }})
+          CURRENT_REL=$(echo "${CURRENT_REL_JSON}" | jq .values)
+          if [ "${CURRENT_REL}" != "[]" ]; then
+            echo "Release candidate already exist: ${CURRENT_REL}"
             exit 1
           fi
+
+          # Create the release and get the release ID
           TIMESTAMP=$(date -u "+%Y-%m-%d-%H-%M-%S")
-          create_release ${{ env.JIRA_PROJECT_ID }} ${TIMESTAMP} 
+          CREATE_RESULT_JSON=$(create_release ${{ env.JIRA_PROJECT_ID }} ${TIMESTAMP})
+          RELEASE_ID=$(echo "${CREATE_RESULT_JSON}" | jq .id)
+          
+          # Add all jira tickets between prod and staging
+          JIRA_KEYS=$(get_issue_keys_between_staging_and_prod)
+          echo "Found issues: ${JIRA_KEYS}"
+          for JIRA_KEY in ${JIRA_KEYS}; do 
+            add_issue_to_release ${JIRA_KEY} ${RELEASE_ID}
+          done

apps/backend/backend-content.txt

@@ -1,4 +1,4 @@
 This is just a file to test out that changes to back-end source code
 can trigger a build, reporting to Kosli and Jira
 
-counter=6
+counter=7

apps/frontend/frontend-content.txt

@@ -1,4 +1,4 @@
 This is just a file to test out that changes to front-end source code
 can trigger a build, reporting to Kosli and Jira
 
-counter=8
+counter=9

scripts/lib-jira.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-#JIRA_BASE_API="https://kosli-team.atlassian.net"
+#JIRA_BASE_URL="https://kosli-team.atlassian.net"
 #JIRA_USERNAME="tore@kosli.com"
 #JIRA_API_TOKEN="xx"
 #JIRA_PROJECT_ID=10000
@@ -48,15 +48,14 @@ function create_release
 {
     local -r projectId=$1; shift
     local -r releaseName=$1; shift
+    local -r startDate=$(date -u "+%Y-%m-%d")
 
-    local -r url="${JIRA_BASE_API}/rest/api/3/version"
+    local -r url="${JIRA_BASE_URL}/rest/api/3/version"
     local -r data='{
-         "description": "An excellent version",
+         "description": "Release '${releaseName}'",
          "name": "'${releaseName}'",
          "projectId": '${projectId}',
-         "approvers": [{
-             "accountId": "'${approverId}'"
-         }]
+         "startDate": "'${startDate}'"
     }'
     loud_curl_jira POST "${url}" "${data}"
 }
@@ -65,15 +64,15 @@ function get_current_release_candidate
 {
     local -r projectId=$1; shift
 
-    local -r url="${JIRA_BASE_API}/rest/api/3/project/${projectId}/version?status=unreleased"
+    local -r url="${JIRA_BASE_URL}/rest/api/3/project/${projectId}/version?status=unreleased"
     loud_curl_jira GET "${url}" {}
 }
 
 function get_release
 {
     local -r releaseId=$1; shift
 
-    local -r url="${JIRA_BASE_API}/rest/api/3/version/${releaseId}?expand=approvers"
+    local -r url="${JIRA_BASE_URL}/rest/api/3/version/${releaseId}?expand=approvers"
     loud_curl_jira GET "${url}" {}
 }
 
@@ -84,7 +83,7 @@ function add_approver_to_release
     local -r approverId=$1; shift
     local -r releaseId=$1; shift
 
-    local -r url="${JIRA_BASE_API}/rest/api/3/version/${releaseId}"
+    local -r url="${JIRA_BASE_URL}/rest/api/3/version/${releaseId}"
     local -r data='{
         "approvers": [{
             "accountId": "'${approverId}'"
@@ -97,7 +96,7 @@ function add_issue_to_release() {
     local -r issueKey=$1; shift
     local -r releaseId=$1; shift
 
-    local -r url="${JIRA_BASE_API}/rest/api/3/issue/${issueKey}"
+    local -r url="${JIRA_BASE_URL}/rest/api/3/issue/${issueKey}"
     local -r data='{
         "fields": {
             "fixVersions": [{
@@ -111,14 +110,14 @@ function add_issue_to_release() {
 function get_issue {
     local -r issueKey=$1; shift
 
-    local -r url="${JIRA_BASE_API}/rest/api/3/issue/${issueKey}"
+    local -r url="${JIRA_BASE_URL}/rest/api/3/issue/${issueKey}"
     loud_curl_jira GET "${url}" {}
 }
 
-RELEASE_NAME=2025.02.20-r1
+#RELEASE_NAME=2025.02.20-r1
 #get_current_release_candidate ${JIRA_PROJECT_ID}
 #create_release ${JIRA_PROJECT_ID} ${RELEASE_NAME}
 #get_release 10033
-get_issue OPS-5
+#get_issue OPS-5
 #add_issue_to_release OPS-5 10033
 #add_approver_to_release ${JIRA_APPROVER_ID} 10033

scripts/lib-kosli.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
-export KOSLI_ORG=kosli-public
-export KOSLI_API_TOKEN="xx"
-KOSLI_ENV_STAGING=jira-integration-example-staging
-KOSLI_ENV_PROD=jira-integration-example-prod
-KOSLI_FLOW_FRONTEND=jira-example-frontend
-KOSLI_FLOW_BACKEND=jira-example-backend
+#export KOSLI_ORG=kosli-public
+#export KOSLI_API_TOKEN="xx"
+#KOSLI_ENV_STAGING=jira-integration-example-staging
+#KOSLI_ENV_PROD=jira-integration-example-prod
+#KOSLI_FLOW_FRONTEND=jira-example-frontend
+#KOSLI_FLOW_BACKEND=jira-example-backend
 
 function loud_curl
 {
@@ -83,8 +83,7 @@ function get_jira_issue_keys_from_trail
     local -r trailName=$1; shift
 
     local -r url="https://app.kosli.com/api/v2/attestations/${KOSLI_ORG}/${flowName}/trail/${trailName}/jira-ticket"
-    set -o pipefail
-    loud_curl_kosli GET "${url}" {} | jq -r '.[].jira_results[].issue_id'
+    loud_curl_kosli GET "${url}" {} | jq -r '.[].jira_results[] | select(.issue_exists == true) | .issue_id'
 }
 
 function get_all_jira_issue_keys_for_commits
@@ -143,15 +142,16 @@ function get_artifact_flow_commit_mapping_json
 function get_issue_keys_between_staging_and_prod
 {
     commits=$(get_commits_between_staging_and_prod ${KOSLI_ENV_STAGING} ${KOSLI_ENV_PROD})
+    echo "Commits between staging and prod: ${commits}" >&2
     issueKeys=""
     keys=$(get_all_jira_issue_keys_for_commits ${KOSLI_FLOW_FRONTEND} "${commits}")
     issueKeys+=" ${keys}"
     keys=$(get_all_jira_issue_keys_for_commits ${KOSLI_FLOW_BACKEND} "${commits}")
     issueKeys+=" ${keys}"
-    echo ${issueKeys} | tr ' ' '\n' | sort -u
+    echo ${issueKeys} | tr ' ' '\n' | sort -u | tr '\n' ' '
 }
 
-get_issue_keys_between_staging_and_prod
+#get_issue_keys_between_staging_and_prod
 
 #artifactFlowMapping=$(get_artifact_flow_commit_mapping_json ${KOSLI_ENV_STAGING} ${KOSLI_ENV_PROD})
 #