From b33a9cc47dac9fb881486c12da9cea77e9b04019 Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Wed, 17 May 2023 17:42:02 +0200 Subject: [PATCH] resultsdb: Use upstream image for stage instance Related to: https://pagure.io/fedora-infrastructure/issue/11321 --- .../resultsdb/templates/backend/deploymentconfigs.yml | 6 +++++- roles/openshift-apps/resultsdb/vars/main.yml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/roles/openshift-apps/resultsdb/templates/backend/deploymentconfigs.yml b/roles/openshift-apps/resultsdb/templates/backend/deploymentconfigs.yml index 6e4a0b87b9..38bc09d5b3 100644 --- a/roles/openshift-apps/resultsdb/templates/backend/deploymentconfigs.yml +++ b/roles/openshift-apps/resultsdb/templates/backend/deploymentconfigs.yml @@ -25,9 +25,13 @@ spec: # try for 10 minutes (600 seconds) e=$(( $(date +%s) + 600 )) i=0 + entrypoint="" + if [ -f /app/entrypoint.sh ]; then + entrypoint=/app/entrypoint.sh + fi while [ $(date +%s) -lt $e ]; do echo 'TRY #'$((++i)) - if resultsdb init_db ; then + if $entrypoint resultsdb init_db ; then exit 0 fi done diff --git a/roles/openshift-apps/resultsdb/vars/main.yml b/roles/openshift-apps/resultsdb/vars/main.yml index 5e9db8b649..90682ddd34 100644 --- a/roles/openshift-apps/resultsdb/vars/main.yml +++ b/roles/openshift-apps/resultsdb/vars/main.yml @@ -1,6 +1,6 @@ # backend vars prod_resultsdb_image: quay.io/fedora-kube-sig/resultsdb-backend:latest-f35 -stg_resultsdb_image: quay.io/fedora-kube-sig/resultsdb-backend:latest-f35 +stg_resultsdb_image: quay.io/factory2/resultsdb:latest resultsdb_publish: true resultsdb_mod_wsgi_dir: '${MOD_WSGI_MODULES_DIRECTORY}'