diff options
| author | Lingxian Kong <anlin.kong@gmail.com> | 2019-11-28 10:27:35 +1300 |
|---|---|---|
| committer | Lingxian Kong <anlin.kong@gmail.com> | 2019-12-05 07:48:26 +1300 |
| commit | 11b0b8d6f2888f74cbae509fe6c81b0b324d0032 (patch) | |
| tree | b144c0c2fc66236adec29ccae6a903b9ca571c00 /integration/scripts | |
| parent | 8fc0b7695d8e74e9ff45ca4e1857eccbea81726c (diff) | |
| download | trove-11b0b8d6f2888f74cbae509fe6c81b0b324d0032.tar.gz | |
Fix mariadb CI - trove-scenario-mariadb-single
- Trove supports MariaDB 10.4
- From MariaDB 10.3, Mariabackup is used instead of Percona XtraBackup
for backup functionality
- Some log improvements
Change-Id: Ibaa6fd7273b98451097b32fb6b881008a236be9f
Diffstat (limited to 'integration/scripts')
| -rwxr-xr-x | integration/scripts/files/elements/ubuntu-xenial-mariadb/install.d/30-mariadb | 5 | ||||
| -rw-r--r-- | integration/scripts/functions_qemu | 2 | ||||
| -rwxr-xr-x | integration/scripts/trovestack | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/integration/scripts/files/elements/ubuntu-xenial-mariadb/install.d/30-mariadb b/integration/scripts/files/elements/ubuntu-xenial-mariadb/install.d/30-mariadb index 42799364..50eb9256 100755 --- a/integration/scripts/files/elements/ubuntu-xenial-mariadb/install.d/30-mariadb +++ b/integration/scripts/files/elements/ubuntu-xenial-mariadb/install.d/30-mariadb @@ -18,13 +18,14 @@ curl -sS https://downloads.mariadb.com/MariaDB/mariadb_repo_setup | wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb -apt-get update +apt-get install -y -qq apt-transport-https ca-certificates +apt-get update -qq # Disable password prompt debconf-set-selections <<< "mariadb-server mysql-server/root_password password ''" debconf-set-selections <<< "mariadb-server mysql-server/root_password_again password ''" -apt-get install -y --allow-unauthenticated mariadb-server mariadb-client galera-4 libmariadb3 mariadb-backup mariadb-common percona-xtrabackup-24 +apt-get install -y -qq --allow-unauthenticated mariadb-server mariadb-client galera-4 libmariadb3 mariadb-backup mariadb-common cat <<EOF >/etc/mysql/conf.d/no_perf_schema.cnf [mysqld] diff --git a/integration/scripts/functions_qemu b/integration/scripts/functions_qemu index b59c4ad2..db32f52c 100644 --- a/integration/scripts/functions_qemu +++ b/integration/scripts/functions_qemu @@ -86,7 +86,7 @@ function build_vm() { popd > /dev/null sudo rm -rf $TEMP - exclaim "Image ${image_output}.${GUEST_IMAGETYPE} was built successfully." + exclaim "Image ${image_output} was built successfully." } function build_guest_image() { diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack index e48d648d..3b8cd97a 100755 --- a/integration/scripts/trovestack +++ b/integration/scripts/trovestack @@ -563,7 +563,7 @@ function cmd_set_datastore() { VERSION="5.6" elif [ "$DATASTORE_TYPE" == "mariadb" ]; then PACKAGES=${PACKAGES:-"mariadb-server"} - VERSION="10.1" + VERSION="10.4" elif [ "$DATASTORE_TYPE" == "mongodb" ]; then PACKAGES=${PACKAGES:-"mongodb-org"} VERSION="3.2" |