Merge branch 'master' of https://github.com/Telecominfraproject/wlan-testing

.github/actions/generate-allure-report/action.yml

@@ -0,0 +1,54 @@
+name: generate Allure report
+description: Generates an Allure report from Allure results and includes metadata
+
+inputs:
+  results_path:
+    description: path to the Allure results folder
+    required: true
+  history_path:
+    description: path to the Allure history folder
+    required: false
+  allure_version:
+    description: version of Allure to use
+    required: false
+    default: "2.14.0"
+  report_path:
+    description: output path of the Allure report folder
+    required: false
+    default: ./allure-report
+  additional_metadata:
+    description: metadata that will be added to the environment.properties file
+    required: false
+
+runs:
+  using: "composite"
+  steps:
+  - name: install Allure CLI tool
+    shell: bash
+    run: |
+      wget https://repo.maven.apache.org/maven2/io/qameta/allure/allure-commandline/${{ inputs.allure_version }}/allure-commandline-${{ inputs.allure_version }}.tgz
+      tar -xzf allure-commandline-${{ inputs.allure_version }}.tgz
+
+  - name: copy history into results
+    shell: bash
+    run: |
+      if [ -e "${{ inputs.history_path }}" ] ; then
+        cp -r "${{ inputs.history_path }}" "${{ inputs.results_path }}/history"
+      fi
+
+  - name: add report metadata
+    shell: bash
+    run: |
+      cat << EOF >> "${{ inputs.results_path }}/environment.properties"
+
+      Tests.CommitId=${{ github.sha }}
+      CiRun.Id=${{ github.run_id }}
+      CiRun.Number=${{ github.run_number }}
+      CiRun.Url=https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
+      EOF
+
+  - name: generate Allure report
+    shell: bash
+    run: allure-${{ inputs.allure_version }}/bin/allure generate "${{ inputs.results_path }}" -o "${{ inputs.report_path }}"
+
+

.github/workflows/quali.yml

@@ -595,10 +595,6 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson( needs.generate-matrix.outputs.matrix ) }}
     steps:
-    - name: install Allure CLI tool
-      run: |
-        wget https://repo.maven.apache.org/maven2/io/qameta/allure/allure-commandline/${{ env.ALLURE_CLI_VERSION }}/allure-commandline-${{ env.ALLURE_CLI_VERSION }}.tgz
-        tar -xzf allure-commandline-${{ env.ALLURE_CLI_VERSION }}.tgz
     - uses: actions/download-artifact@v2
       with:
         name: allure-results-${{ matrix.ap_model }}
@@ -616,22 +612,13 @@ jobs:
         ref: gh-pages
         path: reports
 
-    - name: copy history into results
-      run: |
-        if [ -e "reports/sanity/${{ matrix.ap_model }}/latest" ] ; then
-          cp -r reports/sanity/${{ matrix.ap_model }}/latest/history/ allure-results/history
-        fi
-    - name: add report metadata
-      run: |
-        cat << EOF >> allure-results/environment.properties
-        Ap.Model=${{ matrix.ap_model }}
-        Tests.CommitId=$(cd wlan-testing && git rev-parse --short HEAD)
-        CiRun.Id=${{ github.run_id }}
-        CiRun.Number=${{ github.run_number }}
-        CiRun.Url=https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
-        EOF
     - name: generate Allure report
-      run: allure-${{ env.ALLURE_CLI_VERSION }}/bin/allure generate
+      uses: ./wlan-testing/.github/actions/generate-allure-report
+      with:
+        results_path: ./allure-results
+        history_path: reports/sanity/${{ matrix.ap_model }}/latest/history
+        additional_metadata: |
+          Ap.Model=${{ matrix.ap_model }}
 
     - name: upload Allure report as artifact
       uses: actions/upload-artifact@v2

.github/workflows/ucentralgw-dev-deployment.yaml

@@ -31,10 +31,10 @@ env:
     {
       "namespace": "dev01",
       "deploy_method": "git",
-      "chart_version": "v2.4.0-RC6",
-      "owgw_version": "v2.4.0-RC5",
-      "owsec_version": "v2.4.0-RC4",
-      "owfms_version": "v2.4.0-RC4",
+      "chart_version": "v2.4.0-RC7",
+      "owgw_version": "v2.4.0-RC6",
+      "owsec_version": "v2.4.0-RC5",
+      "owfms_version": "v2.4.0-RC5",
       "owprov_version": "main",
       "owgwui_version": "v2.4.0-RC2",
       "owprovui_version": "main"

.github/workflows/ucentralgw-qa-deployment.yaml

@@ -31,10 +31,10 @@ env:
     {
       "namespace": "qa01",
       "deploy_method": "git",
-      "chart_version": "v2.4.0-RC6",
-      "owgw_version": "v2.4.0-RC5",
-      "owsec_version": "v2.4.0-RC4",
-      "owfms_version": "v2.4.0-RC4",
+      "chart_version": "v2.4.0-RC7",
+      "owgw_version": "v2.4.0-RC6",
+      "owsec_version": "v2.4.0-RC5",
+      "owfms_version": "v2.4.0-RC5",
       "owprov_version": "main",
       "owgwui_version": "v2.4.0-RC2",
       "owprovui_version": "main"