HOTFIX: Got ampq playbook tests working

cyverse · Feb 14, 2024 · 6d5eba3 · 6d5eba3
1 parent 1aa461a
commit 6d5eba3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/testing/ansible-tester/inventory/host_vars/dstesting-amqp_ubuntu-1.dstesting_default b/testing/ansible-tester/inventory/host_vars/dstesting-amqp_ubuntu-1.dstesting_default
@@ -0,0 +1,2 @@
+---
+rabbitmq_has_systemd: false
diff --git a/testing/env/base/config.sh b/testing/env/base/config.sh
@@ -11,7 +11,6 @@
 
 set -o errexit -o nounset -o pipefail
 
-
 main() {
 	if (( $# < 1 )); then
 		printf 'The OS name is required as the first argument\n' >&2
@@ -58,7 +57,6 @@ main() {
 	mkdir --mode 0700 /root/.ssh
 }
 
-
 # Install the required CentOS packages.
 #
 # Parameters:
@@ -89,7 +87,6 @@ install_centos_packages() {
 		sudo
 }
 
-
 install_ubuntu_packages() {
 	local version="$1"
 
@@ -110,8 +107,11 @@ install_ubuntu_packages() {
 		python3-selinux \
 		python3-virtualenv \
 		sudo
-}
 
+	if [[ "$version" != '18.04' ]]; then
+		apt install --yes --quiet=2 python-is-python3
+	fi
+}
 
 update_pam_sshd_config() {
 	cat <<'EOF' | sed --in-place --file - /etc/pam.d/sshd
@@ -124,7 +124,6 @@ update_pam_sshd_config() {
 EOF
 }
 
-
 update_sshd_config() {
 	cat <<'EOF' | sed --in-place  --regexp-extended --file - /etc/ssh/sshd_config
 s/#?PermitRootLogin .*/PermitRootLogin yes/

diff --git a/testing/env/base/entrypoint.sh b/testing/env/base/entrypoint.sh
@@ -25,7 +25,7 @@
 
 main()
 {
-  Svc="$1"
+  Svc="$*"
 
   start "$Svc"
   trap 'kill ${!}; stop "$Svc"; exit $?' SIGTERM
@@ -68,4 +68,4 @@ stop()
 
 set -e
 
-main "$*"
+main "$@"
diff --git a/testing/env/irods-provider/Dockerfile.configured b/testing/env/irods-provider/Dockerfile.configured
@@ -3,7 +3,6 @@ FROM test-env-base:centos7
 ### Install PostgreSQL ODBC connector
 RUN yum --assumeyes install \
   https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm
-RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG
 RUN yum --assumeyes install postgresql12-odbc
 
 ### Install iRODS