diff options
author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2020-04-29 07:04:47 +0000 |
---|---|---|
committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2020-08-20 21:44:32 +0000 |
commit | a509883207a1140e25e94b8c7f7354e25fd7640e (patch) | |
tree | f961fed68392c6e8bd0ac5ba84ac7d5a024fb60f /coin | |
parent | 015c86534c00b46625500e38d2558f72a6c60536 (diff) |
Replace Ubuntu 18.04 with 20.04
Task-number: QTQAINFRA-3699
Change-Id: Id8c2bc2160d6805339c29961cec784d64c5f0c4d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin')
-rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 2 | ||||
-rw-r--r-- | coin/platform_configs/cmake_platforms_qemu.yaml | 2 | ||||
-rw-r--r-- | coin/platform_configs/default.yaml | 12 | ||||
-rw-r--r-- | coin/platform_configs/flashing-wizard.yaml | 2 | ||||
-rw-r--r-- | coin/platform_configs/meta-boot2qt.yaml | 20 | ||||
-rw-r--r-- | coin/platform_configs/qdb.yaml | 2 | ||||
-rw-r--r-- | coin/platform_configs/qtwebengine.yaml | 12 | ||||
-rw-r--r-- | coin/platform_configs/tqtc-qt-config-gui.yaml | 2 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-install_telegraf.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-systemsetup.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh) | 7 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh) | 10 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-disable-notifications.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-notifications.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-disable-ntp.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-ntp.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-git_lfs.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-git_lfs.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-remove-apport.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-apport.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-remove-update_notifier.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-update_notifier.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/03-gcc.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/03-qemu.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-libclang.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-yocto.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-yocto_ssh_configurations.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/09-install-openssl.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/09-install-openssl.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/20-sccache.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/20-sccache.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/22-mqtt_broker.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-fbx.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-fbx.sh) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/35-install-breakpad.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/35-install-breakpad.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/40-android_linux.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-android_linux.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/40-install-cmake.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/50-openssl_for_android_linux.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/60-qnx660.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/70-qnx700.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/80-docker.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/90-squish.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-squish.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/91-squish-coco.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/99-version.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh) | 0 |
35 files changed, 36 insertions, 35 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 72153c10..12e7bd72 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['Sccache'] Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DQT_NAMESPACE=TestNamespace -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml index 6b3d05d0..70b24855 100644 --- a/coin/platform_configs/cmake_platforms_qemu.yaml +++ b/coin/platform_configs/cmake_platforms_qemu.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index dfbf98e0..8deb9f30 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -6,12 +6,12 @@ Configurations: Features: ['UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -headersclean -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-warnings-are-errors -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' @@ -57,7 +57,7 @@ Configurations: Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' @@ -65,7 +65,7 @@ Configurations: Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QEMU' Target arch: 'arm64' Compiler: 'GCC' @@ -73,7 +73,7 @@ Configurations: Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QEMU' Target arch: 'mips64' Compiler: 'GCC' @@ -81,6 +81,6 @@ Configurations: Environment variables: ['QT_QUICK_BACKEND=software'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64r2-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64r2-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index 14285ce3..df59d158 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -18,6 +18,6 @@ Configurations: Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/meta-boot2qt.yaml b/coin/platform_configs/meta-boot2qt.yaml index e1446696..066568cb 100644 --- a/coin/platform_configs/meta-boot2qt.yaml +++ b/coin/platform_configs/meta-boot2qt.yaml @@ -2,42 +2,42 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'Yocto' Target arch: 'TARGET1' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'Yocto' Target arch: 'TARGET2' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'Yocto' Target arch: 'TARGET3' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'Yocto' Target arch: 'TARGET4' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'Yocto' Target arch: 'TARGET5' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'Yocto' Target arch: 'TARGET6' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'Yocto' Target arch: 'TARGET7' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'Yocto' Target arch: 'TARGET8' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'Yocto' Target arch: 'TARGET9' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'Yocto' Target arch: 'TARGET10' diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index c886ba31..82a4f2a3 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -23,6 +23,6 @@ Configurations: Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/qtwebengine.yaml b/coin/platform_configs/qtwebengine.yaml index 5d464287..a772fea9 100644 --- a/coin/platform_configs/qtwebengine.yaml +++ b/coin/platform_configs/qtwebengine.yaml @@ -7,12 +7,12 @@ Configurations: Features: ['UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -headersclean -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-warnings-are-errors -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' @@ -47,7 +47,7 @@ Configurations: Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' @@ -55,7 +55,7 @@ Configurations: Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QEMU' Target arch: 'arm64' Compiler: 'GCC' @@ -63,7 +63,7 @@ Configurations: Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QEMU' Target arch: 'mips64' Compiler: 'GCC' @@ -71,6 +71,6 @@ Configurations: Environment variables: ['QT_QUICK_BACKEND=software'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64r2-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64r2-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml index 6e5e2afa..34e41a0d 100644 --- a/coin/platform_configs/tqtc-qt-config-gui.yaml +++ b/coin/platform_configs/tqtc-qt-config-gui.yaml @@ -23,6 +23,6 @@ Configurations: Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-install_telegraf.sh index 729f9003..729f9003 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-systemsetup.sh index 5198e230..6b2128e0 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-systemsetup.sh @@ -53,9 +53,10 @@ sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub sudo update-grub # https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1624320 -echo "Setting up workaround for Ubuntu systemd resolve bug" -sudo rm -f /etc/resolv.conf -sudo ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf +# Checking if Ubuntu 20.04 works without this +#echo "Setting up workaround for Ubuntu systemd resolve bug" +#sudo rm -f /etc/resolv.conf +#sudo ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf # remove hostname to get unique based on IP address sudo rm /etc/hostname diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh index dfae2e8b..8f8b2d30 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh @@ -51,10 +51,10 @@ function set_internal_repo { sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled} sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic main restricted universe multiverse - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-backports main restricted universe - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-security main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal-updates main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal-backports main restricted universe + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal-security main restricted universe multiverse EOC } @@ -140,7 +140,7 @@ installPackages+=(libxdamage-dev) installPackages+=(libxrandr-dev) installPackages+=(libfontconfig1-dev) installPackages+=(libxss-dev) -installPackages+=(libsrtp0-dev) +installPackages+=(libsrtp2-dev) installPackages+=(libwebp-dev) installPackages+=(libjsoncpp-dev) installPackages+=(libopus-dev) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-notifications.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-disable-notifications.sh index f38c9bab..f38c9bab 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-notifications.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-disable-notifications.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-disable-ntp.sh index 89806892..89806892 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-ntp.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-disable-ntp.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-git_lfs.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-git_lfs.sh index 7f5140fd..7f5140fd 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-git_lfs.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-git_lfs.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-apport.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-remove-apport.sh index 09477763..09477763 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-apport.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-remove-apport.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-update_notifier.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-remove-update_notifier.sh index 55c6ce79..55c6ce79 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-update_notifier.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-remove-update_notifier.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/03-gcc.sh index 573b30a9..573b30a9 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/03-gcc.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/03-qemu.sh index d4ad40b7..d4ad40b7 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/03-qemu.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-libclang.sh index 0d18dbcf..0d18dbcf 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-libclang.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-yocto.sh index ec6aa217..ec6aa217 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-yocto.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-yocto_ssh_configurations.sh index a6aa3b10..a6aa3b10 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-yocto_ssh_configurations.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/09-install-openssl.sh index 4f1d3768..4f1d3768 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/09-install-openssl.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/09-install-openssl.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/20-sccache.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/20-sccache.sh index b371d947..b371d947 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/20-sccache.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/20-sccache.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/22-mqtt_broker.sh index 7c58c478..7c58c478 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-fbx.sh index d8df4375..d8df4375 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-fbx.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/35-install-breakpad.sh index 74dd1579..74dd1579 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/35-install-breakpad.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/35-install-breakpad.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/40-android_linux.sh index 0527fe85..0527fe85 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-android_linux.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/40-android_linux.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/40-install-cmake.sh index db8a3ff5..db8a3ff5 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/40-install-cmake.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/50-openssl_for_android_linux.sh index 81ea3b17..81ea3b17 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/50-openssl_for_android_linux.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/60-qnx660.sh index 4dd1d40e..4dd1d40e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/60-qnx660.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/70-qnx700.sh index 1d7a3968..1d7a3968 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/70-qnx700.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/80-docker.sh index 82c2c659..82c2c659 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/80-docker.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/90-squish.sh index e4281588..e4281588 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-squish.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/90-squish.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/91-squish-coco.sh index fcc7d31c..fcc7d31c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/91-squish-coco.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/99-version.sh index c8f3ac03..c8f3ac03 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/99-version.sh |