[minor] Review fvt-launcher design for manage and its dependencies

.github/CODEOWNERS

@@ -1 +1 @@
-* @durera @andrercm @sanjayprab @terenceq @whitfiea @alequint
+* @durera @andrercm @sanjayprab @terenceq @whitfiea @alequint @leo-miran

build/bin/build-tekton.sh

@@ -59,7 +59,7 @@ for FILE in $TASK_FILES; do
   FILE_NAME=$(basename $FILE)
   addToFile $FILE $TARGET_FILE_FVT
 
-  if [[ ! "$FILE_NAME" == fvt-* ]]
+  if [[ ! "$FILE_NAME" == fvt-* ]] && [[ ! "$FILE_NAME" == ivt-* ]] && [[ ! "$FILE_NAME" == launchfvt-* ]]
   then
     addToFile $FILE $TARGET_FILE
   fi
@@ -69,7 +69,7 @@ for FILE in $PIPELINE_FILES; do
   FILE_NAME=$(basename $FILE)
   addToFile $FILE $TARGET_FILE_FVT
 
-  if [[ ! "$FILE_NAME" == fvt-* ]] && [[ ! "$FILE_NAME" == *-after-install.yaml ]] && [[ ! "$FILE_NAME" == *-with-fvt.yaml ]]
+  if [[ ! "$FILE_NAME" == fvt-* ]] && [[ ! "$FILE_NAME" == ivt-* ]] && [[ ! "$FILE_NAME" == *-after-install.yaml ]] && [[ ! "$FILE_NAME" == *-with-fvt.yaml ]]
   then
     addToFile $FILE $TARGET_FILE
   fi

image/cli/app-root/src/wait-for-configmap.sh

@@ -68,6 +68,21 @@ do
   esac
 done
 
+echo ""
+echo "Inputs"
+echo "------------------------------------------------------------------"
+echo "Namespace .................. $NAMESPACE"
+echo "Config Map ................. $CONFIGMAP_NAME"
+echo "Config Map Key ............. $CONFIGMAP_KEY"
+echo "Config Map Initial Value.... $CONFIGMAP_INITIAL_VALUE"
+echo "Config Map Target Value..... $CONFIGMAP_TARGET_VALUE"
+echo "Escape Config Map .......... $ESCAPE_CONFIGMAP_NAME"
+echo "Escape Config Map Key ...... $ESCAPE_CONFIGMAP_KEY"
+echo "Max Retries ................ $MAX_RETRIES"
+echo "Delay ...................... $DELAY"
+echo "Ignore Failure ............. $IGNORE_FAILURE"
+echo ""
+
 if [[ -z "$CONFIGMAP_NAME" || -z "$CONFIGMAP_KEY" || -z "$NAMESPACE" ]]; then
   echo "NAMESPACE, CONFIGMAP_NAME, and CONFIGMAP_KEY must all be defined, there is nothing to wait for."
   exit 0
@@ -128,12 +143,12 @@ elif [[ "$KEY_VALUE" == "" && -z "${CONFIGMAP_TARGET_VALUE}" ]]; then
 else
   echo "Waiting for configmap/${CONFIGMAP_NAME} in ${NAMESPACE} to contain key '${CONFIGMAP_KEY}' with value '${CONFIGMAP_TARGET_VALUE}' ..."
   KEY_VALUE=$(oc -n ${NAMESPACE} get configmap/${CONFIGMAP_NAME} -o jsonpath="{.data.${CONFIGMAP_KEY}}" 2> /dev/null)
-  while [[ "$KEY_VALUE" != "${CONFIGMAP_TARGET_VALUE}" && "$RETRIES_USED" -le "$MAX_RETRIES" ]]; do
+  while [[ "${CONFIGMAP_TARGET_VALUE}" != *"$KEY_VALUE"* && "$RETRIES_USED" -le "$MAX_RETRIES" ]]; do
     echo "[$RETRIES_USED/$MAX_RETRIES] ${CONFIGMAP_KEY}=${KEY_VALUE} does not equal '${CONFIGMAP_TARGET_VALUE}' yet in configmap/${CONFIGMAP_NAME}.  Waiting ${DELAY} seconds before checking again"
     sleep $DELAY
     KEY_VALUE=$(oc -n ${NAMESPACE} get configmap/${CONFIGMAP_NAME} -o jsonpath="{.data.${CONFIGMAP_KEY}}" 2> /dev/null)
 
-    if [[ "${KEY_VALUE}" != "${CONFIGMAP_TARGET_VALUE}" && -n "${ESCAPE_CONFIGMAP_NAME}" ]]; then
+    if [[ "${CONFIGMAP_TARGET_VALUE}" != *"${KEY_VALUE}"* && -n "${ESCAPE_CONFIGMAP_NAME}" ]]; then
       # Check if the entire install pipeline has stopped so we can exit early
       ESCAPE_VALUE=$(oc -n ${NAMESPACE} get configmap/${ESCAPE_CONFIGMAP_NAME} -o jsonpath="{.data.${ESCAPE_CONFIGMAP_KEY}}" 2> /dev/null)
       if [[ "$ESCAPE_VALUE" != "" ]]; then
@@ -148,7 +163,7 @@ else
   done
 
   echo
-  if [[ "$KEY_VALUE" == "${CONFIGMAP_TARGET_VALUE}" ]]; then
+  if [[ "${CONFIGMAP_TARGET_VALUE}" == *"$KEY_VALUE"* ]]; then
     echo "Located key ${CONFIGMAP_KEY} in configmap/${CONFIGMAP_NAME} with value '${CONFIGMAP_TARGET_VALUE}'"
     exit 0
   else

image/cli/masfvt/ivt.yml

@@ -0,0 +1,59 @@
+---
+- hosts: localhost
+  any_errors_fatal: true
+  vars:
+    # Image Pull Policy
+    image_pull_policy: "{{ lookup('env', 'IMAGE_PULL_POLICY') }}"
+    # MAS Details
+    mas_app_channel_manage: "{{ lookup('env', 'MAS_APP_CHANNEL_MANAGE') }}"
+    mas_app_channel_monitor: "{{ lookup('env', 'MAS_APP_CHANNEL_MONITOR') }}"
+    mas_instance_id: "{{ lookup('env', 'MAS_INSTANCE_ID') }}"
+    mas_workspace_id: "{{ lookup('env', 'MAS_WORKSPACE_ID') }}"
+    # FVT Configuration
+    fvt_image_registry: "{{ lookup('env', 'FVT_IMAGE_REGISTRY') }}"
+    fvt_artifactory_username: "{{ lookup('env', 'FVT_ARTIFACTORY_USERNAME') }}"
+    fvt_artifactory_token: "{{ lookup('env', 'FVT_ARTIFACTORY_TOKEN') }}"
+    fvt_digest_manage: "{{ lookup('env', 'FVT_DIGEST_MANAGE') }}"
+    fvt_digest_manage_pytest: "{{ lookup('env', 'FVT_DIGEST_MANAGE_PYTEST') }}"
+    fvt_digest_ctf: "{{ lookup('env', 'FVT_DIGEST_CTF') }}"
+    # Black and white listing
+    fvt_blacklist: "{{ lookup('env', 'FVT_BLACKLIST') }}"
+    fvt_whitelist: "{{ lookup('env', 'FVT_WHITELIST') }}"
+    # Pipeline Run Info
+    devops_build_number: "{{ lookup('env', 'DEVOPS_BUILD_NUMBER') | default('0', True) }}"
+    pipelinerun_name: "{{ lookup('env', 'PIPELINERUN_NAME') | default('mas-fvt-manage', True) }}-{{ devops_build_number }}"
+    pipelinerun_namespace: "{{ lookup('env', 'PIPELINERUN_NAMESPACE') | default('mas-' ~ mas_instance_id ~ '-pipelines', True) }}"
+    # Test Data
+    ldap_url: "{{ lookup('env', 'LDAP_URL') }}"
+    ldap_base_dn: "{{ lookup('env', 'LDAP_BASE_DN') }}"
+    ldap_bind_dn: "{{ lookup('env', 'LDAP_BIND_DN') }}"
+    ldap_bind_password: "{{ lookup('env', 'LDAP_BIND_PASSWORD') }}"
+    ldap_user_map: "{{ lookup('env', 'LDAP_USER_MAP') }}"
+    ldap_cert_alias: "{{ lookup('env', 'LDAP_CERT_ALIAS') }}"
+    ldap_crt: "{{ lookup('env', 'LDAP_CRT') }}"
+  tasks:
+    - name: "Debug"
+      debug:
+        msg:
+          - "pipelinerun_name ................ {{ pipelinerun_name }}"
+          - "pipelinerun_namespace ........... {{ pipelinerun_namespace }}"
+          - ""
+          - "mas_app_channel_monitor ......... {{ mas_app_channel_monitor }}"
+          - "mas_app_channel_manage .......... {{ mas_app_channel_manage }}"
+          - "mas_instance_id ................. {{ mas_instance_id }}"
+          - "mas_workspace_id ................ {{ mas_workspace_id }}"
+          - ""
+          - "fvt_image_registry .............. {{ fvt_image_registry }}"
+          - "fvt_artifactory_username ........ {{ fvt_artifactory_username }}"
+          - "fvt_artifactory_token ........... {{ fvt_artifactory_token }}"
+          - "fvt_digest_manage ............... {{ fvt_digest_manage }}"
+          - "fvt_digest_manage_pytest ........ {{ fvt_digest_manage_pytest }}"
+          - "fvt_digest_ctf .................. {{ fvt_digest_ctf }}"
+          - ""
+          - "fvt_blacklist ................... {{ fvt_blacklist }}"
+          - "fvt_whitelist ................... {{ fvt_whitelist }}"
+
+    - name: "Start fvt-manage pipeline"
+      kubernetes.core.k8s:
+        apply: true
+        template: templates/mas-ivt.yml.j2

image/cli/masfvt/templates/mas-ivt.yml.j2

@@ -0,0 +1,58 @@
+---
+apiVersion: tekton.dev/v1beta1
+kind: PipelineRun
+metadata:
+  name: "{{ pipelinerun_name }}"
+  namespace: "{{ pipelinerun_namespace }}"
+  labels:
+    tekton.dev/pipeline: mas-ivt
+spec:
+  pipelineRef:
+    name: mas-ivt
+
+  serviceAccountName: pipeline
+  timeouts:
+    pipeline: "8h"
+
+  params:
+    # Pull Policy
+    - name: image_pull_policy
+      value: "{{ image_pull_policy }}"
+
+    # MAS Info
+    - name: mas_app_channel_manage
+      value: "{{ mas_app_channel_manage }}"
+    - name: mas_instance_id
+      value: "{{ mas_instance_id }}"
+    - name: mas_workspace_id
+      value: "{{ mas_workspace_id }}"
+    - name: mas_app_channel_monitor
+      value: "{{ mas_app_channel_monitor }}"
+
+    # Registry
+    - name: fvt_image_registry
+      value: "{{ fvt_image_registry }}"
+    - name: fvt_artifactory_username
+      value: "{{ fvt_artifactory_username }}"
+    - name: fvt_artifactory_token
+      value: "{{ fvt_artifactory_token }}"
+
+    # Digests of manage
+    - name: fvt_digest_manage
+      value: "{{ fvt_digest_manage }}"
+    - name: fvt_digest_manage_pytest
+      value: "{{ fvt_digest_manage_pytest }}"
+
+    # Digests of monitor
+    - name: fvt_digest_ctf
+      value: "{{ fvt_digest_ctf }}"
+
+  workspaces:
+    # The generated configuration files
+    - name: shared-configs
+      persistentVolumeClaim:
+        claimName: config-pvc
+    # PodTemplates configurations
+    - name: shared-pod-templates
+      secret:
+        secretName: pipeline-pod-templates

tekton/generate-tekton-pipelines.yml

@@ -50,6 +50,7 @@
         - rollback
         - uninstall
         - fvt-launcher
+        - ivt
 
     # 2. Generate Pipelines
     # -------------------------------------------------------------------------

tekton/generate-tekton-tasks.yml

@@ -66,7 +66,6 @@
         - fvt-sls
         - fvt-data-dictionary
         - fvt-run-suite
-        - fvt-wait-for-install
 
     - name: Generate Tasks (FVT Launchers)
       ansible.builtin.template:
@@ -86,6 +85,7 @@
         - launchfvt-visualinspection
         - launchfvt-upgrade-post
         - launchfvt-upgrade-pre
+        - launchivt
 
     # 4. Generate Tasks (IVT)
     # -------------------------------------------------------------------------