Skip to content

Commit 7126d0d

Browse files
authored
67409: Update fusion testing automation to include new no olm recipes, increase flexibility (#2628)
* split hub install and fusion application setup into separate steps Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * add no olm recipes and resources, make resource application more flexible Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * update peripheral resources to have unique names per instance Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * debugging Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * debugging Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * debugging Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * debugging Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * debugging Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * debugging Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * debugging Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * debugging Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * debugging Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * debugging Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * debugging Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * debugging Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * debugging Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * make labeling scripts more flexible inside backup setup Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * debugging resource deployment Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * update properties file Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * debugging Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * update application namespace setting Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * update application namespace setting Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * update application namespace setting Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * update application namespace setting Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * update application namespace setting Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * update application namespace setting Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * revert changes to periph files Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * use standardized name Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * update values Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * add option to specify env properties file Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> * move setting of default output file to after base dir Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com> --------- Signed-off-by: Ben Luzarraga <luzarragaben@gmail.com>
1 parent 07e4585 commit 7126d0d

File tree

5 files changed

+401
-115
lines changed

5 files changed

+401
-115
lines changed

br-testing-automation/env-fusion.properties

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ BR_SERVICE_NAMESPACE="ibm-bnr" #default
99
GITHUB_USER= #requires access to https://github.ibm.com/ProjectAbell/cmd-line-install repo
1010
GITHUB_TOKEN= #requires access to https://github.ibm.com/ProjectAbell/cmd-line-install repo
1111
STORAGE_CLASS=""
12+
NO_OLM="false" #change to true if instance is using helm charts for install instead of OLM subscriptions
1213

1314
#variables for just hub setup
1415
OPERATOR_NS=""
1516
SERVICES_NS=""
16-
TETHERED_NAMESPACE1="" #script assumes two tenant namespaces
17-
TETHERED_NAMESPACE2=""
17+
TETHERED_NS="" #comma delimited list
1818
DOCKER_USER= #not currently used but listed as a prereq for some of the Fusion scripts so included for now
1919
DOCKER_PASS=
2020
BACKUP_STORAGE_LOCATION_NAME="" #name of s3 storage
@@ -28,20 +28,19 @@ LSR_NAMESPACE="ibm-ls-reporter" #default
2828
CPFS_VERSION="4.14" #default
2929
ZENSERVICE_NAME="" #the name of the deployed zenservice, script assumes at least one is deployed
3030
DYNAMIC="true" #false uses old recipes
31-
#below only used if DYNAMIC==true
3231
IM_ENABLED="true"
3332
ZEN_ENABLED="true"
3433
NSS_ENABLED="true"
3534

3635
#label-common-services specific env variables
37-
# disable labeling of cert manager, licensing, and LSR resources by changing value to 0
38-
ENABLE_CERT_MANAGER=1
39-
ENABLE_LICENSING=1
40-
ENABLE_LSR=1
41-
# Change to 1 to enable private catalog
42-
ENABLE_PRIVATE_CATALOG=0
43-
#change to 0 to disable labeling catalog sources in openshift-marketplace
44-
ENABLE_DEFAULT_CS=1
36+
# disable labeling of cert manager, licensing, and LSR resources by changing value to false
37+
ENABLE_CERT_MANAGER="true"
38+
ENABLE_LICENSING="true"
39+
ENABLE_LSR="true"
40+
# Change to "true" to enable private catalog
41+
ENABLE_PRIVATE_CATALOG="false"
42+
#change to "false" to disable labeling catalog sources in openshift-marketplace
43+
ENABLE_DEFAULT_CS="true"
4544
# Add additional CatalogSources separated by comma which are withour ".spec.publisher: IBM"
4645
# For example: "my-catalog,my-catalog2,my-catalog3"
4746
ADDITIONAL_SOURCES=""

0 commit comments

Comments
 (0)