Fixing image creation

Updating image creation to keep compatibility with some package changes.

Story: #2006752
Task: #37236
Change-Id: I23c8d14dce45d003fdfb58fed6591e937b27abab
(cherry picked from commit 2cf6806c18)
This commit is contained in:
Telles Nobrega 2019-10-29 14:25:26 -03:00 committed by Luigi Toscano
parent f682f9aab5
commit a7b37aac86
2 changed files with 2 additions and 3 deletions

View File

@ -6,5 +6,5 @@ MARIADB_VERSION=$(rpm -qa mariadb | cut -d- -f2)
INSTALLED=$(rpm -qa | grep -i mariadb-compat-${MARIADB_VERSION}-) INSTALLED=$(rpm -qa | grep -i mariadb-compat-${MARIADB_VERSION}-)
if [[ -z "$INSTALLED" ]]; then if [[ -z "$INSTALLED" ]]; then
rpm -ivh --nodeps http://yum.mariadb.org/$MARIADB_VERSION/rhel7-amd64/rpms/MariaDB-$MARIADB_VERSION-centos73-x86_64-compat.rpm rpm -ivh --nodeps http://yum.mariadb.org/$MARIADB_VERSION/rhel7-amd64/rpms/MariaDB-compat-$MARIADB_VERSION-1.el7.centos.x86_64.rpm
fi fi

View File

@ -109,7 +109,6 @@ validators:
- redhat-lsb - redhat-lsb
- redhat-lsb-core - redhat-lsb-core
- redhat-lsb-printing - redhat-lsb-printing
- urw-fonts
- yum-utils - yum-utils
- xml-common - xml-common
- ubuntu: - ubuntu: