Tweaks to component filter

RedHatInsights · Jun 10, 2021 · 62728fd · 62728fd
1 parent a3274fc
commit 62728fd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/bonfire/bonfire.py b/bonfire/bonfire.py
@@ -324,10 +324,10 @@ def _validate_set_image_tag(ctx, param, value):
         "--component",
         "-C",
         "component_filter",
-        help="Component that should be processed (default: all components)",
+        help="Specific component(s) that should be processed (default: all)",
         type=str,
         multiple=True,
-    )
+    ),
 ]
 
 

diff --git a/bonfire/processor.py b/bonfire/processor.py
@@ -298,8 +298,12 @@ def _process_app(self, app_name):
         app_cfg = self._get_app_config(app_name)
         for component in app_cfg["components"]:
             component_name = component["name"]
+            log.debug("app '%s' has component '%s'", app_name, component_name)
             if self.component_filter and component_name not in self.component_filter:
-                log.debug("skipping component '%s'", component_name)
+                log.debug(
+                    "skipping component '%s', not found in --component filter", component_name
+                )
+                self.processed_components.add(component_name)
                 continue
             self._process_component(component_name)
 

diff --git a/cicd/_common_deploy_logic.sh b/cicd/_common_deploy_logic.sh
@@ -2,7 +2,7 @@
 #APP_NAME="myapp"  # name of app-sre "application" folder this component lives in
 #COMPONENT_NAME="mycomponent"  # name of app-sre "resourceTemplate" in deploy.yaml for this component
 #IMAGE="quay.io/cloudservices/mycomponent"  # image that this application uses
-#COMPONENTS="component1 component2"  # components to deploy (optional)
+#COMPONENTS="component1 component2"  # specific components to deploy (optional, default: all)
 
 # Env vars set by 'bootstrap.sh':
 #IMAGE_TAG="abcd123"  # image tag for the PR being tested
@@ -72,5 +72,5 @@ if [ ! -z "$COMPONENTS" ]; then
     for c in $COMPONENTS; do
         options="$options --component $c"
     done
-    export COMPONENTS=$options
+    export COMPONENTS_ARG=$options
 fi
diff --git a/cicd/deploy_ephemeral_db.sh b/cicd/deploy_ephemeral_db.sh
@@ -24,7 +24,7 @@ bonfire process \
     --set-image-tag $IMAGE=$IMAGE_TAG \
     --no-get-dependencies \
     --namespace $NAMESPACE \
-    $COMPONENTS | oc apply -f - -n $NAMESPACE
+    $COMPONENTS_ARG | oc apply -f - -n $NAMESPACE
 
 bonfire namespace wait-on-resources $NAMESPACE --db-only
 

diff --git a/cicd/deploy_ephemeral_env.sh b/cicd/deploy_ephemeral_env.sh
@@ -11,4 +11,4 @@ bonfire deploy \
     --set-template-ref ${APP_NAME}/${COMPONENT_NAME}=${GIT_COMMIT} \
     --set-image-tag ${IMAGE}=${IMAGE_TAG} \
     --namespace ${NAMESPACE} \
-    ${COMPONENTS}
+    ${COMPONENTS_ARG}