From 4ee798b6ef283b228c9d68632930ec41228c463a Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Thu, 13 Jun 2024 13:18:37 +0300 Subject: [PATCH] Provisioning: Update Axivion tool and configuration New tool version corrects crashes in Analysis. New configuration fixes git config in Axivion dashboard server. Task-number: QTQAINFRA-5965 Task-number: QTQAINFRA-6348 Task-number: QTQAINFRA-6260 Change-Id: Ice7c9efd398236e1f5186f756f23c321aba0cf79 Reviewed-by: Jukka Jokiniva --- coin/platform_configs/nightly_qt5_axivion.yaml | 2 +- .../common/linux/axivion-bauhaus-suite.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/coin/platform_configs/nightly_qt5_axivion.yaml b/coin/platform_configs/nightly_qt5_axivion.yaml index a1c871b1..29386150 100644 --- a/coin/platform_configs/nightly_qt5_axivion.yaml +++ b/coin/platform_configs/nightly_qt5_axivion.yaml @@ -9,5 +9,5 @@ Configurations: Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE' ] diff --git a/coin/provisioning/common/linux/axivion-bauhaus-suite.sh b/coin/provisioning/common/linux/axivion-bauhaus-suite.sh index ab4ce5ef..8fdecbac 100755 --- a/coin/provisioning/common/linux/axivion-bauhaus-suite.sh +++ b/coin/provisioning/common/linux/axivion-bauhaus-suite.sh @@ -24,9 +24,9 @@ DownloadAndExtract () { # Axivion Bauhaus Suite -sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_7_4-x86_64-gnu_linux.tar.gz" -targetFile="bauhaus-suite-7_7_4-x86_64-gnu_linux.tar.gz" -sha1="df17ac0521864a7f1c0b5b3bfded1817cbf47bae" +sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_8_0-x86_64-gnu_linux.tar.gz" +targetFile="bauhaus-suite-7_8_0-x86_64-gnu_linux.tar.gz" +sha1="bae1a7091ab9582822bfcd00b826e07d9b467a04" cd "$HOME" DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$HOME" @@ -36,9 +36,9 @@ wget http://ci-files01-hki.ci.qt.io/input/axivion/Qt_Evaluation_QSR_INTERN_20250 cd "$HOME" #Axivion configuration -configurationFile="http://ci-files01-hki.ci.qt.io/input/axivion/axivion_config_771_new.tar.gz" +configurationFile="http://ci-files01-hki.ci.qt.io/input/axivion/axivion_config_780_2506.tar.gz" configurationTargetFile="axivion_config.tar.gz" -configSha1="db77f376e0b3ee0f7a74701790d1c8abe792bebe" +configSha1="a27c4db94e8b875e756dc820259fffdd7afc19b6" DownloadAndExtract "$configurationFile" "$configSha1" "$configurationTargetFile" "$HOME" -echo "Axivion Bauhaus Suite = 7.7.4" >> ~/versions.txt +echo "Axivion Bauhaus Suite = 7.8.0" >> ~/versions.txt