Skip to content

Commit

Permalink
Remove install setup and use from common repo
Browse files Browse the repository at this point in the history
Also adjust upstream .fmf plan and check channel
just under condition, if it's deployment provided
via oc client.
  • Loading branch information
Koncpa committed Mar 28, 2024
1 parent 1f156ed commit 9b04b6f
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 82 deletions.
3 changes: 2 additions & 1 deletion Plans/packit-ci.fmf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,7 +24,7 @@ discover:
how: fmf
test:
- /Setup/creating_test_namespace
- /Sanity
- /Sanity/DAST_test
- /Setup/clean_cluster

adjust:
Expand Down
6 changes: 4 additions & 2 deletions Plans/upstream-operator-all-tests.fmf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ 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
Expand All @@ -19,10 +21,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
Expand Down
2 changes: 1 addition & 1 deletion Setup/clean_cluster/runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Setup/creating_test_namespace/main.fmf
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ tag:
require+:
- libvirt-daemon
- podman
duration: 5m
enabled: true
duration: 15m
enabled: true
4 changes: 3 additions & 1 deletion Setup/creating_test_namespace/runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
15 changes: 0 additions & 15 deletions Setup/install_upstream_tang-operator/main.fmf

This file was deleted.

58 changes: 0 additions & 58 deletions Setup/install_upstream_tang-operator/runtest.sh

This file was deleted.

4 changes: 2 additions & 2 deletions TestHelpers/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9b04b6f

Please sign in to comment.