This is an automated email from the ASF dual-hosted git repository. gfournier pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 566dfcdbbae20f5139aec039fc6bae6ff4fd2a2d Author: Jono <[email protected]> AuthorDate: Sun Jun 9 00:52:10 2024 +1200 fix/5484 remove problematic reporting --- .github/actions/e2e-builder/action.yml | 6 -- .github/actions/e2e-common/action.yml | 6 -- .github/actions/e2e-install-olm/action.yml | 6 -- .github/actions/e2e-install-upgrade/action.yml | 6 -- .github/actions/e2e-install/action.yml | 6 -- .github/actions/e2e-knative-yaks/action.yml | 6 -- .github/actions/e2e-knative/action.yml | 6 -- .github/actions/e2e-native/action.yml | 6 -- .github/actions/e2e-telemetry/action.yml | 6 -- .../actions/kamel-report-problematic/action.yml | 35 --------- .../kamel-report-problematic/report-problematic.sh | 89 ---------------------- 11 files changed, 178 deletions(-) diff --git a/.github/actions/e2e-builder/action.yml b/.github/actions/e2e-builder/action.yml index 919a8c3f1..e7e6cceee 100644 --- a/.github/actions/e2e-builder/action.yml +++ b/.github/actions/e2e-builder/action.yml @@ -103,12 +103,6 @@ runs: image-registry-insecure: ${{steps.config-cluster.outputs.cluster-image-registry-insecure }} image-version: ${{ steps.build-kamel.outputs.build-binary-local-image-version }} - - id: report-problematic - name: List Tests Marked As Problematic - uses: ./.github/actions/kamel-report-problematic - with: - test-suite: global/builder - - id: run-it name: Run IT shell: bash diff --git a/.github/actions/e2e-common/action.yml b/.github/actions/e2e-common/action.yml index b96e2921e..ece3d7d46 100644 --- a/.github/actions/e2e-common/action.yml +++ b/.github/actions/e2e-common/action.yml @@ -107,12 +107,6 @@ runs: image-registry-insecure: ${{steps.config-cluster.outputs.cluster-image-registry-insecure }} image-version: ${{ steps.build-kamel.outputs.build-binary-local-image-version }} - - id: report-problematic - name: List Tests Marked As Problematic - uses: ./.github/actions/kamel-report-problematic - with: - test-suite: global/common - - id: run-it name: Run IT shell: bash diff --git a/.github/actions/e2e-install-olm/action.yml b/.github/actions/e2e-install-olm/action.yml index a302a480e..a6ef550e0 100644 --- a/.github/actions/e2e-install-olm/action.yml +++ b/.github/actions/e2e-install-olm/action.yml @@ -95,12 +95,6 @@ runs: catalog-source-name: ${{ steps.config-cluster.outputs.cluster-catalog-source-name }} catalog-source-namespace: ${{ steps.config-cluster.outputs.cluster-catalog-source-namespace }} - - id: report-problematic - name: List Tests Marked As Problematic - uses: ./.github/actions/kamel-report-problematic - with: - test-suite: namespace/upgrade - - name: Run IT shell: bash run: | diff --git a/.github/actions/e2e-install-upgrade/action.yml b/.github/actions/e2e-install-upgrade/action.yml index ec7610b0e..f5cadc83f 100644 --- a/.github/actions/e2e-install-upgrade/action.yml +++ b/.github/actions/e2e-install-upgrade/action.yml @@ -95,12 +95,6 @@ runs: catalog-source-name: ${{ steps.config-cluster.outputs.cluster-catalog-source-name }} catalog-source-namespace: ${{ steps.config-cluster.outputs.cluster-catalog-source-namespace }} - - id: report-problematic - name: List Tests Marked As Problematic - uses: ./.github/actions/kamel-report-problematic - with: - test-suite: namespace/upgrade - - name: Run IT shell: bash run: | diff --git a/.github/actions/e2e-install/action.yml b/.github/actions/e2e-install/action.yml index 68fee7459..2b7ddcc05 100644 --- a/.github/actions/e2e-install/action.yml +++ b/.github/actions/e2e-install/action.yml @@ -86,12 +86,6 @@ runs: image-registry-insecure: ${{steps.config-cluster.outputs.cluster-image-registry-insecure }} image-version: ${{ steps.build-kamel.outputs.build-binary-local-image-version }} - - id: report-problematic - name: List Tests Marked As Problematic - uses: ./.github/actions/kamel-report-problematic - with: - test-suite: namespace/install - - id: run-it name: Run IT shell: bash diff --git a/.github/actions/e2e-knative-yaks/action.yml b/.github/actions/e2e-knative-yaks/action.yml index 83becbcad..4cebbf620 100644 --- a/.github/actions/e2e-knative-yaks/action.yml +++ b/.github/actions/e2e-knative-yaks/action.yml @@ -108,12 +108,6 @@ runs: image-name: "docker.io/citrusframework/yaks" version: 0.14.3 - - id: report-problematic - name: List Tests Marked As Problematic - uses: ./.github/actions/kamel-report-problematic - with: - test-suite: yaks/common - - id: run-it name: Run IT shell: bash diff --git a/.github/actions/e2e-knative/action.yml b/.github/actions/e2e-knative/action.yml index f445d51bd..53d8a6261 100644 --- a/.github/actions/e2e-knative/action.yml +++ b/.github/actions/e2e-knative/action.yml @@ -103,12 +103,6 @@ runs: image-registry-insecure: ${{steps.config-cluster.outputs.cluster-image-registry-insecure }} image-version: ${{ steps.build-kamel.outputs.build-binary-local-image-version }} - - id: report-problematic - name: List Tests Marked As Problematic - uses: ./.github/actions/kamel-report-problematic - with: - test-suite: global/knative - - id: run-it name: Run IT shell: bash diff --git a/.github/actions/e2e-native/action.yml b/.github/actions/e2e-native/action.yml index aed604915..7f1049028 100644 --- a/.github/actions/e2e-native/action.yml +++ b/.github/actions/e2e-native/action.yml @@ -86,12 +86,6 @@ runs: image-registry-insecure: ${{steps.config-cluster.outputs.cluster-image-registry-insecure }} image-version: ${{ steps.build-kamel.outputs.build-binary-local-image-version }} - - id: report-problematic - name: List Tests Marked As Problematic - uses: ./.github/actions/kamel-report-problematic - with: - test-suite: namespace/native - - id: run-it name: Run IT shell: bash diff --git a/.github/actions/e2e-telemetry/action.yml b/.github/actions/e2e-telemetry/action.yml index 14f2f1bcb..4ce1190d7 100644 --- a/.github/actions/e2e-telemetry/action.yml +++ b/.github/actions/e2e-telemetry/action.yml @@ -105,12 +105,6 @@ runs: otlp-collector-image-name: otel/opentelemetry-collector otlp-collector-image-version: 0.102.0 - - id: report-problematic - name: List Tests Marked As Problematic - uses: ./.github/actions/kamel-report-problematic - with: - test-suite: global/common - - id: run-it name: Run IT shell: bash diff --git a/.github/actions/kamel-report-problematic/action.yml b/.github/actions/kamel-report-problematic/action.yml deleted file mode 100644 index c981858ab..000000000 --- a/.github/actions/kamel-report-problematic/action.yml +++ /dev/null @@ -1,35 +0,0 @@ -# --------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --------------------------------------------------------------------------- - -name: kamel-report-problematic -description: 'Reports the number of tests labelled as problematic in test suite' - -inputs: - test-suite: - description: "The test suite to be analysed" - required: true - -runs: - using: "composite" - steps: - - id: report-problematic - name: Report Tests Marked As Problematic - shell: bash - if: ${{ always() }} - run: | - ./.github/actions/kamel-report-problematic/report-problematic.sh \ - -t "${{ inputs.test-suite }}" diff --git a/.github/actions/kamel-report-problematic/report-problematic.sh b/.github/actions/kamel-report-problematic/report-problematic.sh deleted file mode 100755 index 03a6b17bd..000000000 --- a/.github/actions/kamel-report-problematic/report-problematic.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash - -# --------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --------------------------------------------------------------------------- - -#### -# -# Find all test that are labelled as problematic -# -#### - -set -e - -while getopts ":t:" opt; do - case "${opt}" in - t) - TEST_SUITE=${OPTARG} - ;; - :) - echo "ERROR: Option -$OPTARG requires an argument" - exit 1 - ;; - \?) - echo "ERROR: Invalid option -$OPTARG" - exit 1 - ;; - esac -done -shift $((OPTIND-1)) - -if [ -z "${TEST_SUITE}" ]; then - echo "Error: ${0} -t <test-suite>" - exit 1 -fi - -TEST_DIR="./e2e/${TEST_SUITE}" - -if [ ! -d "${TEST_DIR}" ]; then - echo "No e2e directory available ... exiting" - exit 0 -fi - -PROBLEMATIC=() -while IFS= read -r -d '' f -do - - func="" - while IFS= read -r line - do - if [[ "${line}" =~ ^[\ ]+\*[\ ] ]]; then - # Ignore comments - continue - elif [[ "${line}" =~ ^func* ]]; then - func=$(echo "${line}" | sed -n "s/func \([a-zA-Z0-9]\+\).*/\1/p") - elif [[ "${line}" =~ CAMEL_K_TEST_SKIP_PROBLEMATIC ]]; then - PROBLEMATIC[${#PROBLEMATIC[*]}]="${f}::${func}" - fi - done < ${f} - -done < <(find "${TEST_DIR}" -name "*.go" -print0) - -if [ "${CAMEL_K_TEST_SKIP_PROBLEMATIC}" == "true" ]; then - if [ ${#PROBLEMATIC[*]} -gt 0 ]; then - echo "=== Problematic Tests (${#PROBLEMATIC[*]}) ===" - for prob in "${PROBLEMATIC[@]}" - do - echo " ${prob}" - done - echo "===" - else - echo "=== No Tests marked as Problematic ===" - fi -else - echo "=== All tests to be executed, including those marked as problematic (${#PROBLEMATIC[*]}) ===" -fi
