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 · Apr 9, 2024 · 8e3c99c · 8e3c99c
1 parent 1f156ed
commit 8e3c99c
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 82 deletions.
diff --git a/Plans/packit-ci.fmf b/Plans/packit-ci.fmf
@@ -11,6 +11,7 @@ prepare:
 environment:
   TANG_IMAGE: "quay.io/sec-eng-special/fedora_tang_server"
   CI: "true"
+  EXECUTION_MODE: "MINIKUBE"
 
 discover:
   - name: Configure_test_system

diff --git a/Plans/upstream-operator-all-tests.fmf b/Plans/upstream-operator-all-tests.fmf
@@ -10,19 +10,21 @@ prepare:
 
 environment:
   TANG_IMAGE: "quay.io/sec-eng-special/fedora_tang_server"
-  UPSTREAM_TANG: "true"
+  UPSTREAM_OPERATOR: "true"
+  REPO_CLONE: "tang"
+  EXECUTION_MODE: "minikube"
 
 discover:
   - name: Configure_test_system
     how: fmf
     url: https://github.com/RedHat-SP-Security/common-cloud-orchestration
-    ref: main
+    ref: pk_rename_export_script
     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/clean_cluster/runtest.sh b/Setup/clean_cluster/runtest.sh
@@ -50,7 +50,7 @@ rlJournalStart
         fi
         rlRun "${OC_CLIENT} delete -f ${TEST_NAMESPACE_FILE}" 0 "Deleting test namespace:${TEST_NAMESPACE}"
 
-        if [ "${UPSTREAM_TANG}" == "true" ]; then
+        if [ "${UPSTREAM_OPERATOR}" == "true" ]; then
             rlLog "Stop running registry container."
             rlRun "podman rm --force -t 2 registry"
         fi

diff --git a/Setup/creating_test_namespace/main.fmf b/Setup/creating_test_namespace/main.fmf
@@ -10,5 +10,5 @@ tag:
 require+:
   - libvirt-daemon
   - podman
-duration: 5m
-enabled: true
+duration: 15m
+enabled: true
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 [ "${DOWNSTREAM_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
diff --git a/TestHelpers/functions.sh b/TestHelpers/functions.sh
@@ -44,8 +44,8 @@ TO_POD_STOP=5 #seconds
 TO_SERVICE_START=120 #seconds
 TO_SERVICE_STOP=120 #seconds
 
-if [ -d /etc/profile.d/upstream_tang_init.sh ]; then
-    sh /etc/profile.d/upstream_tang_init.sh
+if [ -d /etc/profile.d/upstream_operator_init.sh ]; then
+    sh /etc/profile.d/upstream_operator_init.sh
 fi
 
 TO_ALL_POD_CONTROLLER_TERMINATE=120 #seconds