From 8576fc38c842f2b68084943a4c2741954555a116 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 24 Jun 2021 14:55:30 -0400 Subject: [PATCH] Remove database setup logic We've fixed windmill/windmill to do this. Depends-On: https://review.opendev.org/c/windmill/windmill/+/798005/ Change-Id: I0bb0107106cfea5806db1f04520a5dc728a68fd7 Signed-off-by: Paul Belanger --- bindep.txt | 2 -- tools/test-setup.sh | 44 -------------------------------------------- 2 files changed, 46 deletions(-) delete mode 100755 tools/test-setup.sh diff --git a/bindep.txt b/bindep.txt index 05c2341..e9d825b 100644 --- a/bindep.txt +++ b/bindep.txt @@ -6,8 +6,6 @@ libffi-devel [platform:rpm] libffi-dev [platform:dpkg] libselinux-python [platform:rpm] libssl-dev [platform:dpkg] -mysql-client [test !platform:rpm] -mysql-server [test] openssl-devel [platform:rpm] python3-dnf [platform:fedora] python3-devel [platform:rpm] diff --git a/tools/test-setup.sh b/tools/test-setup.sh deleted file mode 100755 index 241ee37..0000000 --- a/tools/test-setup.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -ex -# Copyright 2018 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Be sure mysql is started. -sudo service mysql start - -# The root password for the MySQL database; pass it in via -# MYSQL_ROOT_PW. -DB_ROOT_PW=${MYSQL_ROOT_PW:-insecure_worker} - -# This user and its password are used by the tests, if you change it, -# your tests might fail. -DB_USER=openstack_citest -DB_PW=openstack_citest - -sudo -H mysqladmin -u root password $DB_ROOT_PW - -# It's best practice to remove anonymous users from the database. If -# a anonymous user exists, then it matches first for connections and -# other connections from that host will not work. -sudo -H mysql -u root -p$DB_ROOT_PW -h localhost -e " - DELETE FROM mysql.user WHERE User=''; - FLUSH PRIVILEGES; - CREATE USER '$DB_USER'@'%' IDENTIFIED BY '$DB_PW'; - GRANT ALL PRIVILEGES ON *.* TO '$DB_USER'@'%' WITH GRANT OPTION;" - -# Now create our database. -mysql -u $DB_USER -p$DB_PW -h 127.0.0.1 -e " - SET default_storage_engine=MYISAM; - DROP DATABASE IF EXISTS openstack_citest; - CREATE DATABASE openstack_citest CHARACTER SET utf8;"