From cfa2a96026b1681a55c9ebdaaa899ad28e465e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Fri, 1 Sep 2023 13:20:21 +0200 Subject: [PATCH] IBX-6383: Remove Allure reports integration from Behat and CI --- behat_ibexa_oss.yaml | 5 --- bin/ibexareport | 81 -------------------------------------------- composer.json | 4 +-- 3 files changed, 1 insertion(+), 89 deletions(-) delete mode 100755 bin/ibexareport diff --git a/behat_ibexa_oss.yaml b/behat_ibexa_oss.yaml index a72ea766..3046b7ad 100644 --- a/behat_ibexa_oss.yaml +++ b/behat_ibexa_oss.yaml @@ -13,8 +13,6 @@ default: cache: false formatters: pretty: true - allure: - output_path: '%paths.base%/build/allure' extensions: Behat\MinkExtension: files_path: '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/src/lib/Behat/TestFiles/' @@ -63,9 +61,6 @@ default: mode: normal limit: 10 - Allure\Behat\AllureFormatterExtension: - image_attachment_limit: 5 - suites: ~ regression: diff --git a/bin/ibexareport b/bin/ibexareport deleted file mode 100755 index a36081c9..00000000 --- a/bin/ibexareport +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/bash -# Examples of use: -# -# Default use in Travis builds: -# bin/ibexareport -# -# Specify non-default SSH key and tested bundle name (required to run script outside Travis runs) -# bin/ibexareport -i=path/to/sshkey -r=BehatBundle -# Reports generated in this way will be hosted on the server in BehatBundle/manual/time_stamp directory - -SSH_KEY_PATH='vendor/ezsystems/behatbundle/bin/.travis/rsa_allure' -ALLURE_BUILD_PATH='build/allure/' -HOST_NAME='allure.ez.no' - - # Help command output -usage(){ -echo -e "\ -Usage: -\t ibexareport [OPTIONS...] - -Options: - -\t -i=PATH; path to SSH Key for non-default ssh keys or manual script runs outside Travis machines; -\t -r, --repository=REPOSITORY_NAME; tested repository name - only for manual script runs outside Travis machines; -\t -h; show this help message; -" | column -t -s ";" -} - - # Error message -error(){ - echo "ibexareport: invalid option -- '$1'"; - echo "Try 'ibexareport -h' for more information."; - exit 1; -} - -zip_report_files(){ -cd ${ALLURE_BUILD_PATH} -TIMESTAMP=$(date "+h%H-m%M") -SUFFIX=$(echo $RANDOM) -if [ -z $REPOSITORY_NAME ]; -then - REPORT_NAME="$(echo $GITHUB_REPOSITORY | cut -d'/' -f 2).$GITHUB_RUN_ID.$GITHUB_RUN_NUMBER"; -else - DATESTAMP=$(date "+%Y-%m-%d") - REPORT_NAME="$REPOSITORY_NAME.manual.$DATESTAMP"; -fi -ZIP_FILENAME="$REPORT_NAME-$TIMESTAMP-$SUFFIX" -ZIP_FILENAME_EX="$ZIP_FILENAME.zip" -sudo zip $ZIP_FILENAME_EX * -cd - -} - -send_report_to_server(){ -sftp -o StrictHostKeyChecking=no -q -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR -i $SSH_KEY_PATH allure@$HOST_NAME:incoming/ <<< $"put ${ALLURE_BUILD_PATH}${ZIP_FILENAME_EX}" 1> /dev/null - -if [ $? -ne 0 ]; then - exit 1 -fi - -ADDRESS_PATH="$(echo $ZIP_FILENAME | sed 's/\./\//g')" -WEB_ADDRESS="http://$HOST_NAME/$ADDRESS_PATH" -echo "$WEB_ADDRESS" -} - -process_report(){ -zip_report_files 1> /dev/null; -send_report_to_server; -} - - -for i in "$@" -do -case $i in - -i=*) SSH_KEY_PATH="${i#*=}"; shift;; - -r=*|--repository=*) REPOSITORY_NAME="${i#*=}"; shift;; - -h|--help) usage; exit 1;; - *) error $1;; -esac -done - -process_report; diff --git a/composer.json b/composer.json index 3fd602ac..df5ab005 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,6 @@ "bex/behat-screenshot": "^2.1", "dmore/behat-chrome-extension": "^1.3", "dmore/chrome-mink-driver": "^2.7", - "ezsystems/allure-behat": "^3.3@dev", - "ezsystems/allure-php-api": "^3.3@dev", "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.1@dev", "ezsystems/ezplatform-http-cache": "^2.3@dev", "ezsystems/ezplatform-kernel": "^1.3@dev", @@ -75,7 +73,7 @@ "dev-master": "8.3.x-dev" } }, - "bin": ["bin/ibexabehat", "bin/ibexareport"], + "bin": ["bin/ibexabehat"], "config": { "allow-plugins": { "composer/package-versions-deprecated": true,