ci-scripts: remove unnecessary step to build openvidu-test-e2e

pull/780/head
pabloFuente 2023-03-09 17:27:13 +01:00
parent ac8af98404
commit bc694f43d1
3 changed files with 20 additions and 40 deletions

View File

@ -4,41 +4,41 @@ on:
branches: branches:
- master - master
paths-ignore: paths-ignore:
- '.github/workflows/openvidu-components-angular-E2E.yml' - ".github/workflows/openvidu-components-angular-E2E.yml"
- 'openvidu-components-angular/**' - "openvidu-components-angular/**"
- 'openvidu-server/docker/**' - "openvidu-server/docker/**"
- 'openvidu-server/deployments/**' - "openvidu-server/deployments/**"
pull_request: pull_request:
branches: branches:
- master - master
workflow_dispatch: workflow_dispatch:
inputs: inputs:
TEST_IMAGE: TEST_IMAGE:
description: 'Docker image where to run the tests' description: "Docker image where to run the tests"
required: true required: true
default: 'openvidu/openvidu-test-e2e:22.04' default: "openvidu/openvidu-test-e2e:22.04"
KURENTO_MEDIA_SERVER_IMAGE: KURENTO_MEDIA_SERVER_IMAGE:
description: 'Docker image of kurento-media-server' description: "Docker image of kurento-media-server"
required: true required: true
default: 'kurento/kurento-media-server:6.18.0' default: "kurento/kurento-media-server:6.18.0"
MEDIASOUP_CONTROLLER_VERSION: MEDIASOUP_CONTROLLER_VERSION:
description: 'Tag of image openvidu/mediasoup-controller' description: "Tag of image openvidu/mediasoup-controller"
required: true required: true
default: 'master' default: "master"
KURENTO_JAVA_COMMIT: KURENTO_JAVA_COMMIT:
description: 'Commit to use in kurento-java dependencies. If "default" the release version declared in property "version.kurento" of openvidu-parent/pom.xml will be used' description: 'Commit to use in kurento-java dependencies. If "default" the release version declared in property "version.kurento" of openvidu-parent/pom.xml will be used'
required: true required: true
default: 'default' default: "default"
DOCKER_RECORDING_VERSION: DOCKER_RECORDING_VERSION:
description: 'Force version of openvidu/openvidu-recording container' description: "Force version of openvidu/openvidu-recording container"
required: true required: true
default: 'default' default: "default"
CHROME_VERSION: CHROME_VERSION:
description: 'Version of Chrome to use. Must be a valid image tag from https://hub.docker.com/r/selenium/standalone-chrome/tags' description: "Version of Chrome to use. Must be a valid image tag from https://hub.docker.com/r/selenium/standalone-chrome/tags"
required: true required: true
default: latest default: latest
FIREFOX_VERSION: FIREFOX_VERSION:
description: 'Version of Firefox to use. Must be a valid image tag from https://hub.docker.com/r/selenium/standalone-firefox/tags' description: "Version of Firefox to use. Must be a valid image tag from https://hub.docker.com/r/selenium/standalone-firefox/tags"
required: true required: true
default: latest default: latest
# OPERA_VERSION: # OPERA_VERSION:
@ -46,7 +46,7 @@ on:
# required: true # required: true
# default: latest # default: latest
EDGE_VERSION: EDGE_VERSION:
description: 'Version of Edge to use. Must be a valid image tag from https://hub.docker.com/r/selenium/standalone-opera/tags' description: "Version of Edge to use. Must be a valid image tag from https://hub.docker.com/r/selenium/standalone-opera/tags"
required: true required: true
default: latest default: latest
jobs: jobs:
@ -89,14 +89,12 @@ jobs:
run: /opt/commons.sh --build-openvidu-testapp run: /opt/commons.sh --build-openvidu-testapp
- name: Build openvidu-server dashboard - name: Build openvidu-server dashboard
run: /opt/commons.sh --build-openvidu-server-dashboard run: /opt/commons.sh --build-openvidu-server-dashboard
- name: Build openvidu-server
run: /opt/commons.sh --build-openvidu-server
- name: openvidu-server unit tests - name: openvidu-server unit tests
run: ci-scripts/openvidu-e2e-tests.sh --openvidu-server-unit-tests run: ci-scripts/openvidu-e2e-tests.sh --openvidu-server-unit-tests
- name: openvidu-server integration tests - name: openvidu-server integration tests
run: ci-scripts/openvidu-e2e-tests.sh --openvidu-server-integration-tests run: ci-scripts/openvidu-e2e-tests.sh --openvidu-server-integration-tests
- name: Build openvidu-test-e2e
run: ci-scripts/openvidu-e2e-tests.sh --build-openvidu-test-e2e
- name: Build openvidu-server
run: /opt/commons.sh --build-openvidu-server
- name: Environment launch Kurento - name: Environment launch Kurento
run: ci-scripts/openvidu-e2e-tests.sh --environment-launch-kurento run: ci-scripts/openvidu-e2e-tests.sh --environment-launch-kurento
- name: Serve openvidu-testapp - name: Serve openvidu-testapp
@ -107,7 +105,7 @@ jobs:
uses: mikepenz/action-junit-report@v3 uses: mikepenz/action-junit-report@v3
if: always() # always run even if the previous step fails if: always() # always run even if the previous step fails
with: with:
report_paths: '**/target/surefire-reports/TEST-*.xml' report_paths: "**/target/surefire-reports/TEST-*.xml"
- name: Upload logs - name: Upload logs
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
if: always() # always run even if the previous step fails if: always() # always run even if the previous step fails

View File

@ -457,7 +457,7 @@ fi
# ------------- # -------------
if [[ "${BUILD_OV_PARENT}" == true ]]; then if [[ "${BUILD_OV_PARENT}" == true ]]; then
mvn -B versions:set-property -Dproperty=version.openvidu.java.client -DnewVersion=TEST mvn -B versions:set-property -Dproperty=version.openvidu.java.client -DnewVersion=TEST
mvn -B -DskipTests=true -Dmaven.artifact.threads=1 clean install mvn -B -DskipTests=true clean install
fi fi
# ------------- # -------------

View File

@ -4,7 +4,6 @@ set -eu -o pipefail
# Ci flags # Ci flags
OV_INTEGRATION_TESTS=false OV_INTEGRATION_TESTS=false
OV_UNIT_TESTS=false OV_UNIT_TESTS=false
BUILD_OV_TEST_E2E=false
LAUNCH_OV_KURENTO=false LAUNCH_OV_KURENTO=false
OV_E2E_KURENTO=false OV_E2E_KURENTO=false
LAUNCH_OV_MEDIASOUP=false LAUNCH_OV_MEDIASOUP=false
@ -170,9 +169,6 @@ if [[ -n ${1:-} ]]; then
--openvidu-server-integration-tests) --openvidu-server-integration-tests)
OV_INTEGRATION_TESTS=true OV_INTEGRATION_TESTS=true
;; ;;
--build-openvidu-test-e2e)
BUILD_OV_TEST_E2E=true
;;
--environment-launch-kurento) --environment-launch-kurento)
LAUNCH_OV_KURENTO=true LAUNCH_OV_KURENTO=true
;; ;;
@ -213,20 +209,6 @@ if [[ "${OV_INTEGRATION_TESTS}" == true ]]; then
popd popd
fi fi
# -------------
# Build openvidu-test-e2e
# -------------
if [[ "${BUILD_OV_TEST_E2E}" == true ]]; then
pushd openvidu-test-browsers
mvn -B versions:set -DnewVersion=TEST && mvn -B clean install
popd
mvn -B versions:set-property -Dproperty=version.openvidu.java.client -DnewVersion=TEST
mvn -B versions:set-property -Dproperty=version.openvidu.test.browsers -DnewVersion=TEST
pushd openvidu-test-e2e
mvn -B -DskipTests=true clean install
popd
fi
# ------------- # -------------
# Environment launch Kurento # Environment launch Kurento
# ------------- # -------------