From bda2e4cd5f0bcf3548b55e28d2361f1d259fe625 Mon Sep 17 00:00:00 2001 From: Derek Horton Date: Mon, 9 Sep 2024 10:59:37 -0500 Subject: [PATCH 1/4] Empty-Commit From dc01c5c3456db421590df9002bc4c68cf8186fa2 Mon Sep 17 00:00:00 2001 From: Derek Horton Date: Mon, 9 Sep 2024 12:00:18 -0500 Subject: [PATCH 2/4] Add IQE env var to disable rbac tests/checks --- pr_check.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pr_check.sh b/pr_check.sh index 16d6e5a3..07729b17 100755 --- a/pr_check.sh +++ b/pr_check.sh @@ -7,6 +7,7 @@ COMPONENT_NAME="playbook-dispatcher" # name of app-sre "resourceTemplate" in de CONNECT_COMPONENT_NAME="playbook-dispatcher-connect" IMAGE="quay.io/cloudservices/playbook-dispatcher" IQE_CJI_TIMEOUT="30m" +IQE_ENV_VARS="DYNACONF_USER_PROVIDER__rbac_enabled=false" REF_ENV="insights-stage" # Install bonfire repository/initialize From 1948c0c76251411ac9df836b062fc04230370cc5 Mon Sep 17 00:00:00 2001 From: Brandon Schneider Date: Mon, 9 Sep 2024 12:30:15 -0500 Subject: [PATCH 3/4] Fix race condition We need cloud-connector first now --- pr_check.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pr_check.sh b/pr_check.sh index 07729b17..17034a54 100755 --- a/pr_check.sh +++ b/pr_check.sh @@ -36,11 +36,6 @@ EXTRA_DEPLOY_ARGS="--set-image-tag ${IMAGE_DISPATCHER}=${IMAGE_TAG} --set-templa # Deploy to an ephemeral environment source $CICD_ROOT/deploy_ephemeral_env.sh -# Run Playbook Dispatcher isolated tests -IQE_PLUGINS="playbook-dispatcher" -IQE_MARKER_EXPRESSION="smoke" -source $CICD_ROOT/cji_smoke_test.sh - # Re-deploy Playbook Dispatcher to an ephemeral environment, this time enabling the communication with Cloud Connector # The connect image template is overridden to make use of the connect.yaml file from before managed kafka was put in place bonfire deploy playbook-dispatcher cloud-connector \ @@ -54,6 +49,11 @@ bonfire deploy playbook-dispatcher cloud-connector \ --timeout ${DEPLOY_TIMEOUT} \ --set-parameter playbook-dispatcher/CLOUD_CONNECTOR_IMPL=impl +# Run Playbook Dispatcher isolated tests +IQE_PLUGINS="playbook-dispatcher" +IQE_MARKER_EXPRESSION="smoke" +source $CICD_ROOT/cji_smoke_test.sh + # Run RHC Contract integration tests COMPONENT_NAME="cloud-connector" IQE_PLUGINS="rhc-contract" From d4bfb5c4743bda95de52d570592e19532d2b05ee Mon Sep 17 00:00:00 2001 From: Brandon Schneider Date: Mon, 9 Sep 2024 13:08:15 -0500 Subject: [PATCH 4/4] We need host-inventory as well --- pr_check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pr_check.sh b/pr_check.sh index 17034a54..6466fd0e 100755 --- a/pr_check.sh +++ b/pr_check.sh @@ -38,7 +38,7 @@ source $CICD_ROOT/deploy_ephemeral_env.sh # Re-deploy Playbook Dispatcher to an ephemeral environment, this time enabling the communication with Cloud Connector # The connect image template is overridden to make use of the connect.yaml file from before managed kafka was put in place -bonfire deploy playbook-dispatcher cloud-connector \ +bonfire deploy playbook-dispatcher cloud-connector host-inventory \ --source=appsre \ --ref-env ${REF_ENV} \ --set-template-ref ${COMPONENT_NAME}=${GIT_COMMIT} \