Remove install setup and use from common repo

Also adjust upstream .fmf plan and check channel just under condition, if it's deployment provided via oc client.
RedHat-SP-Security · Mar 8, 2024 · 96256fa · 96256fa
1 parent 1f156ed
commit 96256fa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 75 deletions.
diff --git a/Plans/upstream-operator-all-tests.fmf b/Plans/upstream-operator-all-tests.fmf
@@ -11,6 +11,7 @@ prepare:
 environment:
   TANG_IMAGE: "quay.io/sec-eng-special/fedora_tang_server"
   UPSTREAM_TANG: "true"
+  REPO_CLONE: "tang"
 
 discover:
   - name: Configure_test_system
@@ -19,10 +20,10 @@ discover:
     ref: main
     test:
       - /Setup/setup_local_cluster
+      - /Setup/install_upstream_operator
   - name: Run_tests
     how: fmf
     test:
-      - /Setup/install_upstream_tang-operator
       - /Setup/creating_test_namespace
       - /Sanity
       - /Setup/clean_cluster

diff --git a/Setup/creating_test_namespace/runtest.sh b/Setup/creating_test_namespace/runtest.sh
@@ -59,6 +59,8 @@ rlJournalStart
         rlRun "ocpopCheckPodStateAndContinues Running ${TIMEOUT_CONTROLLER_KEEPS_RUNNING} ${OPERATOR_NAMESPACE} ${controller_name}" 0 \
               "Checking controller POD continues Running [${TIMEOUT_CONTROLLER_KEEPS_RUNNING} secs.]"
 	#SECENGSP-5573 Issue
-	rlRun "ocpopCheckOperatorChannel tang-operator stable"
+        if [ "${OPERATOR_DEPLOYMENT_CLI}" == "true" ]; then
+            rlRun "ocpopCheckOperatorChannel tang-operator stable"
+        fi
     rlPhaseEnd
 rlJournalEnd
diff --git a/Setup/install_upstream_tang-operator/main.fmf b/Setup/install_upstream_tang-operator/main.fmf
diff --git a/Setup/install_upstream_tang-operator/runtest.sh b/Setup/install_upstream_tang-operator/runtest.sh