NRL-633 Revise env names

Author: Tomdango

.github/workflows/pr-env-deploy.yml

@@ -24,13 +24,19 @@ jobs:
       - name: Set a ID based on the branch name
         id: set_environment_id
         run: |
-          JIRA_TICKET=$(echo '${{ github.event.pull_request.head.ref }}' | grep -Po --color=none '[A-z]{3,4}-[0-9]{3,5}' | tr '[:upper:]' '[:lower:]' || true)
-          BRANCH_HASH=$(echo '${{ github.event.pull_request.head.ref }}' | sha256sum | head -c 6)
+          JIRA_TICKET=$(
+            echo '${{ github.event.pull_request.head.ref }}' | \
+            grep -Po --color=none '[A-z]{3,4}-[0-9]{3,5}' | \
+            sed 's/-//g' | \
+            tr '[:upper:]' '[:lower:]' || \
+            true
+          )
+          BRANCH_HASH=$(echo '${{ github.event.pull_request.head.ref }}${{ github.event.pull_request.id }}' | sha256sum | head -c 6)
 
           if [ -z "$JIRA_TICKET" ]; then
-            echo "environment_id=pr-${BRANCH_HASH}" > $GITHUB_OUTPUT
+            echo "environment_id=${BRANCH_HASH}" > $GITHUB_OUTPUT
           else
-            echo "environment_id=pr-${JIRA_TICKET}-${BRANCH_HASH}" > $GITHUB_OUTPUT
+            echo "environment_id=${JIRA_TICKET}-${BRANCH_HASH}" > $GITHUB_OUTPUT
           fi
     outputs:
       environment_id: ${{ steps.set_environment_id.outputs.environment_id }}

.github/workflows/pr-env-destroy.yml

@@ -24,13 +24,19 @@ jobs:
       - name: Set a ID based on the branch name
         id: set_environment_id
         run: |
-          JIRA_TICKET=$(echo '${{ github.event.pull_request.head.ref }}' | grep -Po --color=none '[A-z]{3,4}-[0-9]{3,5}' | tr '[:upper:]' '[:lower:]' || true)
-          BRANCH_HASH=$(echo '${{ github.event.pull_request.head.ref }}' | sha256sum | head -c 6)
+          JIRA_TICKET=$(
+            echo '${{ github.event.pull_request.head.ref }}' | \
+            grep -Po --color=none '[A-z]{3,4}-[0-9]{3,5}' | \
+            sed 's/-//g' | \
+            tr '[:upper:]' '[:lower:]' || \
+            true
+          )
+          BRANCH_HASH=$(echo '${{ github.event.pull_request.head.ref }}${{ github.event.pull_request.id }}' | sha256sum | head -c 6)
 
           if [ -z "$JIRA_TICKET" ]; then
-            echo "environment_id=pr-${BRANCH_HASH}" > $GITHUB_OUTPUT
+            echo "environment_id=${BRANCH_HASH}" > $GITHUB_OUTPUT
           else
-            echo "environment_id=pr-${JIRA_TICKET}-${BRANCH_HASH}" > $GITHUB_OUTPUT
+            echo "environment_id=${JIRA_TICKET}-${BRANCH_HASH}" > $GITHUB_OUTPUT
           fi
 
     outputs: