Merge branch 'master' into OPSEXP-2382-reusable-terraform

.github/actions/calculate-next-internal-version/action.yml

@@ -20,7 +20,7 @@ runs:
   using: "composite"
   steps:
     - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-pysemver@v5.0.1
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-pysemver@v5.3.0
     - id: next-prerelease-resolver
       run: ${{ github.action_path }}/next-prerelease.sh
       shell: bash

.github/actions/dbp-charts/publish-chart/action.yml

@@ -26,7 +26,7 @@ runs:
       with:
         fetch-depth: 0
     - name: Get branch name
-      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.0.1
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.3.0
     - name: Publish
       run: ${{ github.action_path }}/publish_chart.sh
       shell: bash

.github/actions/dbp-charts/verify-helm/action.yml

@@ -85,14 +85,14 @@ runs:
         password: ${{ inputs.docker_password }}
     - name: Get branch name
       uses: >-
-        Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.0.1
+        Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.3.0
     - name: Get commit msg
       uses: >-
-        Alfresco/alfresco-build-tools/.github/actions/get-commit-message@v5.0.1
+        Alfresco/alfresco-build-tools/.github/actions/get-commit-message@v5.3.0
     - name: Get a namespace to deploy on
       id: k8sns
       uses: >-
-        Alfresco/alfresco-build-tools/.github/actions/dbp-charts/kubernetes-valid-ns@v5.0.1
+        Alfresco/alfresco-build-tools/.github/actions/dbp-charts/kubernetes-valid-ns@v5.3.0
       with:
         branch_name: ${{ env.BRANCH_NAME }}
         release_prefix: ${{ inputs.release_prefix }}
@@ -111,7 +111,7 @@ runs:
     - name: Upload helm deployments logs as artifacts
       if: always()
       uses: >-
-        Alfresco/alfresco-build-tools/.github/actions/kubectl-keep-nslogs@v5.0.1
+        Alfresco/alfresco-build-tools/.github/actions/kubectl-keep-nslogs@v5.3.0
       with:
         namespace: ${{ steps.k8sns.outputs.namespace }}
     - name: Uninstall Helm releases

.github/actions/docker-build-image/action.yml

@@ -138,7 +138,7 @@ runs:
 
     - name: Upload SARIF Files
       if: always() && inputs.grype-scan-enabled == 'true' && github.event_name == 'push'
-      uses: github/codeql-action/upload-sarif@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
+      uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
       continue-on-error: true # do not fail if GHAS is not enabled
       with:
         sarif_file: ${{ steps.scan.outputs.sarif }}
@@ -182,6 +182,13 @@ runs:
       with:
         mask-password: true
 
+    - name: Create ECR repository if needed
+      if: env.PUSH_IMAGE == 'true'
+      shell: bash
+      run: |
+        aws ecr describe-repositories --repository-names ${IMAGE_REPOSITORY} \
+          || aws ecr create-repository --repository-name ${IMAGE_REPOSITORY}
+
     - name: Build and Push image ${{ env.IMAGE_NAME }}
       if: env.PUSH_IMAGE == 'true'
       uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0

.github/actions/get-build-info/action.yml

@@ -3,7 +3,7 @@ description: "Get build-related info from GitHub and load it as generically name
 runs:
   using: composite
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.0.1
+    - uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.3.0
     - name: "Get build info"
       run: |
         [[ $GITHUB_EVENT_NAME == "pull_request" ]] && IS_PULL_REQUEST="true" || IS_PULL_REQUEST="false"

.github/actions/helm-integration-tests/action.yml

@@ -37,7 +37,7 @@ runs:
   using: composite
   steps:
     - name: Setup rancher
-      uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@v5.0.1
+      uses: Alfresco/alfresco-build-tools/.github/actions/setup-rancher-cli@v5.3.0
       with:
         url: ${{ inputs.test-rancher-url }}
         access-key: ${{ inputs.test-rancher-access-key }}

.github/actions/helm-publish-chart/action.yml

@@ -110,7 +110,7 @@ runs:
         fi
 
     - name: Commit changes
-      uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.0.1
+      uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.3.0
       with:
         username: ${{ inputs.git-username }}
         add-options: .

.github/actions/helm-release-and-publish/action.yml

@@ -44,21 +44,21 @@ runs:
       run: |
         echo "VERSION=$VERSION" >> $GITHUB_ENV
 
-    - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v5.0.1
+    - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v5.3.0
       id: check-tag
       with:
         tag: ${{ env.VERSION }}
         repository-directory: ${{ inputs.chart-repository-dir }}
 
     - name: Update chart version
       if: steps.check-tag.outputs.exists == 'false'
-      uses: Alfresco/alfresco-build-tools/.github/actions/helm-update-chart-version@v5.0.1
+      uses: Alfresco/alfresco-build-tools/.github/actions/helm-update-chart-version@v5.3.0
       with:
         new-version: ${{ env.VERSION }}
         chart-repository-dir: ${{ inputs.chart-repository-dir }}
         chart-dir: ${{ inputs.chart-dir }}
 
-    - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.0.1
+    - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.3.0
       if: steps.check-tag.outputs.exists == 'false'
       with:
         username: ${{ inputs.git-username }}
@@ -75,7 +75,7 @@ runs:
     - name: Package Helm Chart
       if: steps.check-tag.outputs.exists == 'false'
       id: package-helm-chart
-      uses: Alfresco/alfresco-build-tools/.github/actions/helm-package-chart@v5.0.1
+      uses: Alfresco/alfresco-build-tools/.github/actions/helm-package-chart@v5.3.0
       with:
         chart-dir: ${{ inputs.chart-dir }}
         chart-repository-dir: ${{ inputs.chart-repository-dir }}
@@ -88,7 +88,7 @@ runs:
 
     - name: Publish Helm chart
       if: steps.check-tag.outputs.exists == 'false'
-      uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@v5.0.1
+      uses: Alfresco/alfresco-build-tools/.github/actions/helm-publish-chart@v5.3.0
       with:
         helm-charts-repo: ${{inputs.helm-repository}}
         helm-charts-repo-branch: ${{ inputs.helm-repository-branch }}

.github/actions/helm-update-chart-version/action.yml

@@ -13,7 +13,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.0.1
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.3.0
     - name: Update version
       shell: bash
       env:

.github/actions/maven-build-and-tag/action.yml

@@ -81,7 +81,7 @@ runs:
   steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-    - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+    - uses: actions/cache/restore@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -121,7 +121,7 @@ runs:
     - name: Update pom files to the new version
       id: update-pom-to-next-version
       if: github.event_name == 'push' || env.IS_PREVIEW == 'true'
-      uses: Alfresco/alfresco-build-tools/.github/actions/update-pom-to-next-pre-release@v5.0.1
+      uses: Alfresco/alfresco-build-tools/.github/actions/update-pom-to-next-pre-release@v5.3.0
       with:
         property-to-update: ${{ inputs.property-to-update }}
         maven-cli-opts: ${{ steps.compute-maven-options.outputs.result }}
@@ -216,7 +216,7 @@ runs:
       shell: bash
       run: find . -name TEST-*.xml -exec grep -h testcase {} \; | awk -F '"' '{printf("%s#%s() - %.3fms\n", $4, $2, $6); }' | sort -n -k 3 | tail -20
 
-    - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.0.1
+    - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.3.0
       if: github.event_name == 'push'
       with:
         username: ${{ inputs.git-username }}
@@ -229,3 +229,17 @@ runs:
       run: |
         git tag -a $VERSION -m "Release version $VERSION"
         git push origin $VERSION
+
+    - name: Clean m2 cache
+      if: github.event_name == 'push'
+      shell: bash
+      run: |
+        rm -fr ~/.m2/repository/org/activiti
+        rm -fr ~/.m2/repository/com/alfresco
+
+    - name: Save maven cache
+      uses: actions/cache/save@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      if: github.event_name == 'push'
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/actions/maven-release/action.yml

@@ -75,7 +75,7 @@ runs:
         path: '${{ env.REPO_DIR }}'
         token: ${{ inputs.github-token }}
 
-    - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v5.0.1
+    - uses: Alfresco/alfresco-build-tools/.github/actions/git-check-existing-tag@v5.3.0
       id: check-tag
       with:
         tag: ${{ env.RELEASE_VERSION }}
@@ -147,7 +147,7 @@ runs:
 
     - name: Commit changes
       if: steps.check-tag.outputs.exists == 'false'
-      uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.0.1
+      uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v5.3.0
       with:
         username: ${{ inputs.git-username }}
         add-options: -u

.github/actions/reportportal-prepare/action.yml

@@ -17,6 +17,10 @@ inputs:
   rp-extra-attributes:
     description: Extra attributes for Report Portal
     required: false
+  rp-use-static-launch-name:
+    description: If set, the rp-launch-prefix will be used as the full launch name in Report Portal
+    required: false
+    default: "false"
   auto-configure:
     description: >-
       Enables automated default configuration (adds default GitHub context
@@ -42,7 +46,7 @@ runs:
   using: composite
   steps:
     - name: Get branch name
-      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.0.1
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.3.0
 
     - name: Compute Report Portal input info
       id: info
@@ -54,4 +58,5 @@ runs:
         RP_PROJECT: ${{ inputs.rp-project }}
         RP_EXTRA_ATTRIBUTES: ${{ inputs.rp-extra-attributes }}
         AUTO: ${{ inputs.auto-configure }}
+        USE_STATIC_LAUNCH_NAME: ${{ inputs.rp-use-static-launch-name }}
       run: ${{ github.action_path }}/get-rp-input.sh

.github/actions/reportportal-prepare/get-rp-input.sh

@@ -4,7 +4,7 @@ if [[ -n "$RP_LAUNCH_PREFIX" && -n "$RP_TOKEN" && -n "$RP_URL" && -n "$RP_PROJEC
   echo "enabled=true" >> $GITHUB_OUTPUT
 
   RP_LAUNCH_KEY="$RP_LAUNCH_PREFIX"
-  if [[ "$AUTO" == "true" ]]; then
+  if [[ "$AUTO" == "true" && "$USE_STATIC_LAUNCH_NAME" == "false" ]]; then
     RP_LAUNCH_KEY="$RP_LAUNCH_PREFIX-$GITHUB_EVENT_NAME-$GITHUB_RUN_ID"
   fi
   echo "key=$RP_LAUNCH_KEY" >> $GITHUB_OUTPUT
@@ -23,7 +23,9 @@ if [[ -n "$RP_LAUNCH_PREFIX" && -n "$RP_TOKEN" && -n "$RP_URL" && -n "$RP_PROJEC
   OPTS+=' "'-Drp.project="$RP_PROJECT"'"'
   if [[ "$AUTO" == "true" ]]; then
     OPTS+=' "'-Drp.description=["$RUN_TITLE"]\("$RUN_URL"\)'"'
-    OPTS+=' "'-Drp.attributes='branch:'"$BRANCH_NAME"';event:'"$GITHUB_EVENT_NAME"';repository:'"$GITHUB_REPOSITORY"';run:'"$RP_LAUNCH_KEY$RP_EXTRA_ATTRIBUTES"'"'
+    OPTS+=' "'-Drp.attributes='branch:'"$BRANCH_NAME"';event:'"$GITHUB_EVENT_NAME"';repository:'"$GITHUB_REPOSITORY"';ghrun:'"$GITHUB_RUN_ID"';run:'"$RP_LAUNCH_KEY$RP_EXTRA_ATTRIBUTES"'"'
+  else
+    OPTS+=' "'-Drp.attributes='ghrun:'"$GITHUB_RUN_ID$RP_EXTRA_ATTRIBUTES"'"'
   fi
 
   echo "mvn-opts=$OPTS" >> $GITHUB_OUTPUT

.github/actions/reportportal-prepare/tests/reportportal-prepare.bats

@@ -11,6 +11,7 @@ setup() {
     export RP_URL=https://rpserver:8080
     export RP_PROJECT=my-project
     export AUTO=true
+    export USE_STATIC_LAUNCH_NAME=false
 
     export BRANCH_NAME=main
     export GITHUB_SERVER_URL=https://github.com
@@ -74,14 +75,34 @@ teardown() {
 enabled=true
 key=my-tests-push-3665876492
 url=https://rpserver:8080/ui/#my-project/launches/all
-mvn-opts="-Drp.launch=my-tests-push-3665876492" "-Drp.uuid=tok" "-Drp.endpoint=https://rpserver:8080" "-Drp.project=my-project" "-Drp.description=[Run on GitHub Actions 3665876492](https://github.com/mygh/repo/actions/runs/3665876492)" "-Drp.attributes=branch:main;event:push;repository:mygh/repo;run:my-tests-push-3665876492"
+mvn-opts="-Drp.launch=my-tests-push-3665876492" "-Drp.uuid=tok" "-Drp.endpoint=https://rpserver:8080" "-Drp.project=my-project" "-Drp.description=[Run on GitHub Actions 3665876492](https://github.com/mygh/repo/actions/runs/3665876492)" "-Drp.attributes=branch:main;event:push;repository:mygh/repo;ghrun:3665876492;run:my-tests-push-3665876492"
 BATS
 )
     echo "$(< $GITHUB_OUTPUT)"
     [ "$(< $GITHUB_OUTPUT)" = "$expected" ]
     [ "$output" = "$ECHO_ENABLED" ]
 }
 
+@test "rp enabled static" {
+    export USE_STATIC_LAUNCH_NAME="true"
+
+    run get-rp-input.sh
+    [ "$status" -eq 0 ]
+
+    expected=$(cat << BATS
+enabled=true
+key=my-tests
+url=https://rpserver:8080/ui/#my-project/launches/all
+mvn-opts="-Drp.launch=my-tests" "-Drp.uuid=tok" "-Drp.endpoint=https://rpserver:8080" "-Drp.project=my-project" "-Drp.description=[Run on GitHub Actions 3665876492](https://github.com/mygh/repo/actions/runs/3665876492)" "-Drp.attributes=branch:main;event:push;repository:mygh/repo;ghrun:3665876492;run:my-tests"
+BATS
+)
+    echo "$(< $GITHUB_OUTPUT)"
+    [ "$(< $GITHUB_OUTPUT)" = "$expected" ]
+    expected_echo="Report Portal key=my-tests, url=https://rpserver:8080/ui/#my-project/launches/all"
+    echo "$output"
+    [ "$output" = "$expected_echo" ]
+}
+
 @test "rp enabled extra" {
     export RP_EXTRA_ATTRIBUTES=";metafilter:+smoke"
 
@@ -92,7 +113,7 @@ BATS
 enabled=true
 key=my-tests-push-3665876492
 url=https://rpserver:8080/ui/#my-project/launches/all
-mvn-opts="-Drp.launch=my-tests-push-3665876492" "-Drp.uuid=tok" "-Drp.endpoint=https://rpserver:8080" "-Drp.project=my-project" "-Drp.description=[Run on GitHub Actions 3665876492](https://github.com/mygh/repo/actions/runs/3665876492)" "-Drp.attributes=branch:main;event:push;repository:mygh/repo;run:my-tests-push-3665876492;metafilter:+smoke"
+mvn-opts="-Drp.launch=my-tests-push-3665876492" "-Drp.uuid=tok" "-Drp.endpoint=https://rpserver:8080" "-Drp.project=my-project" "-Drp.description=[Run on GitHub Actions 3665876492](https://github.com/mygh/repo/actions/runs/3665876492)" "-Drp.attributes=branch:main;event:push;repository:mygh/repo;ghrun:3665876492;run:my-tests-push-3665876492;metafilter:+smoke"
 BATS
 )
     echo "$(< $GITHUB_OUTPUT)"
@@ -112,7 +133,7 @@ BATS
 enabled=true
 key=my-tests-with-id
 url=https://rpserver:8080/ui/#my-project/launches/all
-mvn-opts="-Drp.launch=my-tests-with-id" "-Drp.uuid=tok" "-Drp.endpoint=https://rpserver:8080" "-Drp.project=my-project"
+mvn-opts="-Drp.launch=my-tests-with-id" "-Drp.uuid=tok" "-Drp.endpoint=https://rpserver:8080" "-Drp.project=my-project" "-Drp.attributes=ghrun:3665876492;metafilter:+smoke"
 BATS
 )
     echo "$(< $GITHUB_OUTPUT)"
@@ -137,7 +158,7 @@ BATS
 enabled=true
 key=my launch prefix with spaces-weird event-3665876492
 url=https://rpserver:8080 with spaces too/ui/#my project with spaces/launches/all
-mvn-opts="-Drp.launch=my launch prefix with spaces-weird event-3665876492" "-Drp.uuid=with some more spaces" "-Drp.endpoint=https://rpserver:8080 with spaces too" "-Drp.project=my project with spaces" "-Drp.description=[Run on GitHub Actions 3665876492](https://github.com/mygh/repo/actions/runs/3665876492)" "-Drp.attributes=branch:main;event:weird event;repository:mygh/repo;run:my launch prefix with spaces-weird event-3665876492"
+mvn-opts="-Drp.launch=my launch prefix with spaces-weird event-3665876492" "-Drp.uuid=with some more spaces" "-Drp.endpoint=https://rpserver:8080 with spaces too" "-Drp.project=my project with spaces" "-Drp.description=[Run on GitHub Actions 3665876492](https://github.com/mygh/repo/actions/runs/3665876492)" "-Drp.attributes=branch:main;event:weird event;repository:mygh/repo;ghrun:3665876492;run:my launch prefix with spaces-weird event-3665876492"
 BATS
 )
     echo "$(< $GITHUB_OUTPUT)"

.github/actions/reportportal-summarize/get-rp-output.sh

@@ -3,12 +3,21 @@
 CONTENT=''
 URL=''
 
+# support spaces on launch key
+urlEncode() {
+  echo $1 | curl -Gso /dev/null -w %{url_effective} --data-urlencode @- "" | sed -E 's/..(.*).../\1/'
+}
+
 if [[ -n "$RP_LAUNCH_KEY" && -n "$RP_TOKEN" && -n "$RP_URL" && -n "$RP_PROJECT" ]]
 then
   echo "enabled=true" >> $GITHUB_OUTPUT
 
-  SEARCH_URL="$RP_URL/api/v1/$RP_PROJECT/launch?filter.cnt.name=$RP_LAUNCH_KEY&page.sort=startTime%2Cnumber%2CDESC"
-  CONTENT=$(curl -s -X GET "$SEARCH_URL" -H  "accept: */*" -H  "Authorization: bearer $RP_TOKEN") || CONTENT=''
+  CONTENT=$(curl -s -G -X GET "$RP_URL/api/v1/$RP_PROJECT/launch" \
+    -d "filter.cnt.name=$(urlEncode "$RP_LAUNCH_KEY")" \
+    -d "filter.has.compositeAttribute=ghrun:$GITHUB_RUN_ID" \
+    -d "page.sort=startTime,number,DESC" \
+    -H "Authorization: bearer $RP_TOKEN" \
+    ) || CONTENT=''
 
   URL="$RP_URL/ui/#$RP_PROJECT/launches/all"
 else

.github/actions/send-slack-notification-slow-job/action.yml

@@ -25,7 +25,7 @@ runs:
 
     - name: Slack Notification
       if: fromJSON(steps.fetch_time.outputs.total_time) > fromJSON(inputs.max-build-time-seconds)
-      uses: Alfresco/alfresco-build-tools/.github/actions/send-slack-notification@v5.0.1
+      uses: Alfresco/alfresco-build-tools/.github/actions/send-slack-notification@v5.3.0
       with:
         channel-id: ${{ inputs.slack-channel }}
         message: 'Max build time exceeded: took ${{ steps.fetch_time.outputs.total_time }} seconds (expected max: ${{ inputs.max-build-time-seconds }} seconds)'

.github/actions/send-slack-notification/action.yml

@@ -82,7 +82,7 @@ runs:
         echo "result=$RESULT" >> $GITHUB_OUTPUT
 
     - name: Get branch name
-      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.0.1
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v5.3.0
 
     - name: Send slack notification
       id: slack

.github/actions/setup-helm-docs/action.yml

@@ -8,7 +8,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v5.0.1
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v5.3.0
       with:
         repo: norwoodj/helm-docs
         version: ${{ inputs.version }}

.github/actions/setup-jx-release-version/action.yml

@@ -8,7 +8,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v5.0.1
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v5.3.0
       with:
         repo: jenkins-x-plugins/jx-release-version
         version: ${{ inputs.version }}

.github/actions/setup-terraform-docs/action.yml

@@ -8,7 +8,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v5.0.1
+    - uses: Alfresco/alfresco-build-tools/.github/actions/setup-github-release-binary@v5.3.0
       with:
         repo: terraform-docs/terraform-docs
         version: ${{ inputs.version }}