openvidu-ci: move check kurento of snapshots from test-utils.sh to build.sh. Remove config of openvidu generic settings in bump

pull/820/head
cruizba 2023-10-14 23:02:56 +02:00
parent da5f55e34b
commit a14f8d997d
4 changed files with 27 additions and 33 deletions

View File

@ -71,7 +71,7 @@ jobs:
- name: Prepare test environment
run: /opt/test-utils.sh --prepare-test-environment "${TEST_IMAGE}"
- name: Check and prepare kurento snapshots
run: /opt/test-utils.sh --check-and-prepare-kurento-snapshot
run: /opt/build.sh --check-and-prepare-kurento-snapshot
- name: Use specific kurento-java commit
if: ${{ env.KURENTO_JAVA_COMMIT != 'default'}}
run: /opt/test-utils.sh --use-specific-kurento-java-commit

View File

@ -17,6 +17,7 @@ BUILD_OV_SERVER=false
BUILD_OV_SERVER_DEPENDENCY=false
BUILD_OV_SERVER_PRO_INSPECTOR=false
BUILD_OV_SERVER_PRO=false
CHECK_AND_PREPARE_KURENTO_SNAPSHOT=false
if [[ -n ${1:-} ]]; then
case "${1:-}" in
@ -74,6 +75,9 @@ if [[ -n ${1:-} ]]; then
--build-openvidu-server-pro)
BUILD_OV_SERVER_PRO=true
;;
--check-and-prepare-kurento-snapshot)
CHECK_AND_PREPARE_KURENTO_SNAPSHOT=true
;;
*)
echo "Unrecognized method $1"
@ -221,3 +225,24 @@ if [[ "${BUILD_OV_SERVER_PRO}" == true ]]; then
mv target/openvidu-server-pro-*.jar /opt/openvidu
popd
fi
# -------------
# Check kurento version from pom.xml
# If kurento version is a snapshot, configure snapshot builds
# -------------
if [[ "${CHECK_AND_PREPARE_KURENTO_SNAPSHOT}" == true ]]; then
# Check if kurento version is a snapshot
KURENTO_VERSION=$(awk -F'[<>]' '/<version.kurento>/ {print $3}' pom.xml)
if [[ "${KURENTO_VERSION}" == *"-SNAPSHOT" ]] && [[ -n "${KURENTO_SNAPSHOTS_URL:-}" ]]; then
echo "Kurento version is a SNAPSHOT: ${KURENTO_VERSION}"
sudo mkdir -p /etc/maven
sudo chmod -R 777 /etc/maven
pushd /etc/maven
rm -f settings.xml
curl https://raw.githubusercontent.com/OpenVidu/openvidu/master/ci-scripts/kurento-snapshots.xml -o settings.xml
sed -i "s|KURENTO_SNAPSHOTS_URL|${KURENTO_SNAPSHOTS_URL}|g" settings.xml
popd
else
echo "Kurento version is not a SNAPSHOT: ${KURENTO_VERSION}"
fi
fi

View File

@ -239,17 +239,7 @@ fi
# Bump Maven project property
# -------------
if [[ "${BUMP_MAVEN_PROPERTY_VERSION}" == true ]]; then
MVN_SETTINGS_FLAG=""
if [[ -n "${OPENVIDU_MAVEN_GENERIC_SETTINGS:-}" ]]; then
# Config file with Kurento Snapshots configuration only
mkdir -p /tmp/maven-generic-settings
echo "${OPENVIDU_MAVEN_GENERIC_SETTINGS}" >/tmp/maven-generic-settings/settings.xml
MVN_SETTINGS_FLAG='--settings /tmp/maven-generic-settings/settings.xml'
fi
mvn --batch-mode $MVN_SETTINGS_FLAG \
mvn --batch-mode \
-DskipTests=true \
versions:set-property \
-Dproperty="${PROPERTY}" \

View File

@ -126,27 +126,6 @@ if [[ "${PREPARE_TEST_ENVIRONMENT}" == true ]]; then
fi
# -------------
# Check kurento version from pom.xml
# If kurento version is a snapshot, configure snapshot builds
# -------------
if [[ "${CHECK_AND_PREPARE_KURENTO_SNAPSHOT}" == true ]]; then
# Check if kurento version is a snapshot
KURENTO_VERSION=$(awk -F'[<>]' '/<version.kurento>/ {print $3}' pom.xml)
if [[ "${KURENTO_VERSION}" == *"-SNAPSHOT" ]] && [[ -n "${KURENTO_SNAPSHOTS_URL:-}" ]]; then
echo "Kurento version is a SNAPSHOT: ${KURENTO_VERSION}"
sudo mkdir -p /etc/maven
sudo chmod -R 777 /etc/maven
pushd /etc/maven
rm -f settings.xml
curl https://raw.githubusercontent.com/OpenVidu/openvidu/master/ci-scripts/kurento-snapshots.xml -o settings.xml
sed -i "s|KURENTO_SNAPSHOTS_URL|${KURENTO_SNAPSHOTS_URL}|g" settings.xml
popd
else
echo "Kurento version is not a SNAPSHOT: ${KURENTO_VERSION}"
fi
fi
# -------------
# Use a specific kurento-java commit other than the configured in openvidu-parent pom.xml
# -------------