diff --git a/ci-operator/config/openshift-kni/eco-ci-cd/openshift-kni-eco-ci-cd-main__cnf-ran-two-sno-4.20.yaml b/ci-operator/config/openshift-kni/eco-ci-cd/openshift-kni-eco-ci-cd-main__cnf-ran-two-sno-4.20.yaml index 4d19ba6fba530..bd47900ef0655 100644 --- a/ci-operator/config/openshift-kni/eco-ci-cd/openshift-kni-eco-ci-cd-main__cnf-ran-two-sno-4.20.yaml +++ b/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 diff --git a/ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-config/telcov10n-functional-cnf-ran-hub-config-commands.sh b/ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-config/telcov10n-functional-cnf-ran-hub-config-commands.sh index 9b7440bf3a5cf..a6ea37ea2cfbd 100644 --- a/ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-config/telcov10n-functional-cnf-ran-hub-config-commands.sh +++ b/ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-config/telcov10n-functional-cnf-ran-hub-config-commands.sh @@ -64,13 +64,13 @@ 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" diff --git a/ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-config/telcov10n-functional-cnf-ran-hub-config-ref.yaml b/ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-config/telcov10n-functional-cnf-ran-hub-config-ref.yaml index 9272c1af3d6f8..01cfe80a74d8e 100644 --- a/ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-config/telcov10n-functional-cnf-ran-hub-config-ref.yaml +++ b/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//, policygentemplates//) - 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 diff --git a/ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-deploy/telcov10n-functional-cnf-ran-hub-deploy-commands.sh b/ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-deploy/telcov10n-functional-cnf-ran-hub-deploy-commands.sh index 62fdc18131736..77ea858bc89b4 100644 --- a/ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-deploy/telcov10n-functional-cnf-ran-hub-deploy-commands.sh +++ b/ci-operator/step-registry/telcov10n/functional/cnf-ran/hub-deploy/telcov10n-functional-cnf-ran-hub-deploy-commands.sh @@ -60,8 +60,8 @@ find ${MOUNTED_HOST_INVENTORY}/"${CLUSTER_NAME}"/ -mindepth 1 -type d | while re done cd /eco-ci-cd -ansible-playbook ./playbooks/deploy-ocp-sno.yml -i ./inventories/ocp-deployment/build-inventory.py \ - --extra-vars "release=${VERSION} cluster_name=${CLUSTER_NAME} disconnected=true" +# ansible-playbook ./playbooks/deploy-ocp-sno.yml -i ./inventories/ocp-deployment/build-inventory.py \ +# --extra-vars "release=${VERSION} cluster_name=${CLUSTER_NAME} disconnected=true" echo "Store inventory in SHARED_DIR" cp -r /eco-ci-cd/inventories/ocp-deployment/host_vars/* "${SHARED_DIR}"/