cnf ran: two_sno added operator deployment step

Author: kononovn

ci-operator/config/openshift-kni/eco-ci-cd/openshift-kni-eco-ci-cd-main__cnf-ran-two-sno-4.20.yaml

@@ -24,9 +24,19 @@ tests:
   steps:
     env:
       CLUSTER_NAME: fthub-01
+      HUB_OPERATORS: |
+        [
+          {"name":"local-storage-operator","catalog":"redhat-operators","nsname":"openshift-local-storage","channel":"stable","og_name":"local-operator-group","subscription_name":"local-storage-operator","deploy_default_config":false,"ns_annotations":{"workload.openshift.io/allowed":"management"}},
+          {"name":"openshift-gitops-operator","catalog":"redhat-operators","nsname":"openshift-gitops-operator","channel":"latest","og_name":"openshift-gitops-operator","subscription_name":"openshift-gitops-operator","deploy_default_config":false,"og_spec":{"targetNamespaces":[]}},
+          {"name":"advanced-cluster-management","catalog":"redhat-operators","nsname":"open-cluster-management","channel":"release-2.15","og_name":"open-cluster-management","subscription_name":"acm-operator-subscription","deploy_default_config":false,"og_spec":{"targetNamespaces":["open-cluster-management"]}},
+          {"name":"multicluster-engine","catalog":"redhat-operators","nsname":"multicluster-engine","channel":"stable-2.10","og_name":"multicluster-engine","subscription_name":"multicluster-engine","deploy_default_config":true,"og_spec":{}},
+          {"name":"topology-aware-lifecycle-manager","catalog":"topology-aware-lifecycle-manager-fbc","og_name":"global-operators","nsname":"openshift-operators","fbc_iib_repo":"latest","channel":"stable","deploy_default_config":false,"ocp_operator_mirror_fbc_image_base":"quay.io/redhat-user-workloads/telco-5g-tenant/topology-aware-lifecycle-manager-fbc-${VERSION_TAG}"},
+          {"name":"cluster-logging","catalog":"redhat-operators","nsname":"openshift-logging","channel":"stable-6.2","default_channel":"stable-6.4","og_name":"cluster-logging","subscription_name":"cluster-logging","og_spec":{"targetNamespaces":[]}}
+        ]
       VERSION: "4.20"
     pre:
     - ref: telcov10n-functional-cnf-ran-hub-deploy
+    - ref: telcov10n-functional-cnf-ran-hub-config
 zz_generated_metadata:
   branch: main
   org: openshift-kni

ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-config/telcov10n-functional-cnf-ran-hub-config-commands.sh

@@ -64,19 +64,19 @@ if [[ -f "${SHARED_DIR}/cluster_name" ]]; then
     CLUSTER_NAME=$(cat "${SHARED_DIR}/cluster_name")
 fi
 
-export CLUSTER_NAME="kni-qe-99"
 echo CLUSTER_NAME=${CLUSTER_NAME}
 
 # Set kubeconfig path
-KUBECONFIG_PATH="/home/telcov10n/project/generated/kni-qe-99/auth/kubeconfig"
+KUBECONFIG_PATH="/home/telcov10n/project/generated/${CLUSTER_NAME}/auth/kubeconfig"
 
 # Extract and configure SSH key for Ansible to connect to masters
-echo "Set up SSH key configuration for Ansible"
-PROJECT_DIR="/tmp"
-cat /var/group_variables/common/all/ansible_ssh_private_key > "${PROJECT_DIR}/ansible_ssh_key"
-chmod 600 "${PROJECT_DIR}/ansible_ssh_key"
-export ANSIBLE_PRIVATE_KEY_FILE="${PROJECT_DIR}/ansible_ssh_key"
-echo "SSH key configured at: ${ANSIBLE_PRIVATE_KEY_FILE}"
+
+# echo "Set up SSH key configuration for Ansible"
+# PROJECT_DIR="/tmp"
+# cat /var/group_variables/common/all/ansible_ssh_private_key > "${PROJECT_DIR}/ansible_ssh_key"
+# chmod 600 "${PROJECT_DIR}/ansible_ssh_key"
+# export ANSIBLE_PRIVATE_KEY_FILE="${PROJECT_DIR}/ansible_ssh_key"
+# echo "SSH key configured at: ${ANSIBLE_PRIVATE_KEY_FILE}"
 
 # Configure Ansible SSH settings for connection resilience
 export ANSIBLE_SSH_RETRIES=3
@@ -111,12 +111,11 @@ if [[ "$VERSION" == "4.14" ]]; then
     SKIP_REGISTRY_CLEANUP="ocp_operator_mirror_skip_internal_registry_cleanup=true"
 fi
 
-ansible-playbook ./playbooks/deploy-ocp-operators.yml -i ./inventories/ocp-deployment/build-inventory.py \
-    --extra-vars "kubeconfig=${KUBECONFIG_PATH} version=$VERSION disconnected=$DISCONNECTED operators='$HUB_OPERATORS' $SKIP_REGISTRY_CLEANUP"
+# ansible-playbook ./playbooks/deploy-ocp-operators.yml -i ./inventories/ocp-deployment/build-inventory.py \
+#     --extra-vars "kubeconfig=${KUBECONFIG_PATH} version=$VERSION disconnected=$DISCONNECTED operators='$HUB_OPERATORS' $SKIP_REGISTRY_CLEANUP"
 
 # configure lso 
 ansible-playbook playbooks/ran/hub-sno-configure-lvm-storage.yml -i ./inventories/ocp-deployment/build-inventory.py \
-    --private-key="${PROJECT_DIR}/ansible_ssh_key" \
     --extra-vars "kubeconfig=${KUBECONFIG_PATH}" -vv
 
 # configure acm

ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-config/telcov10n-functional-cnf-ran-hub-config-ref.yaml

@@ -14,7 +14,7 @@ ref:
     default: "4.19"
     documentation: OCP version; must match ztp-site-configs-ci folder (siteconfigs/<VERSION>/, policygentemplates/<VERSION>/)
   - name: CLUSTER_NAME
-    default: ""
+    default: "kni-qe-99"
     documentation: BM Cluster name
   - name: HUB_OPERATORS 
     default: |
@@ -33,9 +33,6 @@ ref:
   - name: GITLAB_REPO_URL
     default: "https://gitlab.cee.redhat.com/telcov10n/ztp-site-configs-ci.git"
     documentation: ztp-site-configs-ci repo URL
-  - name: GITLAB_REPO_BRANCH
-    default: "standard"
-    documentation: Branch to use in ztp-site-configs-ci
   credentials:
     - namespace: test-credentials
       name: telcov10n-ansible-group-all

ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-deploy/telcov10n-functional-cnf-ran-hub-deploy-commands.sh

@@ -2,6 +2,7 @@
 set -e
 set -o pipefail
 
+exit 0
 echo "Checking if the job should be skipped..."
 if [ -f "${SHARED_DIR}/skip.txt" ]; then
   echo "Detected skip.txt file — skipping the job"