Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[KIECLOUD-134] Enhance KieServerStateOpenShiftRepository #165

Merged
merged 2 commits into from
Mar 13, 2019
Merged

[KIECLOUD-134] Enhance KieServerStateOpenShiftRepository #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92837fa
[KIECLOUD-134] Enhance KieServerStateOpenShiftRepository - Fixing nam…
Mar 13, 2019
fc15d31
[KIECLOUD-134] Enhance KieServerStateOpenShiftRepository - Adding glo…
Mar 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 10 additions & 7 deletions jboss-kie-workbench/added/launch/jboss-kie-workbench.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ function prepareEnv() {
unset APPFORMER_JMS_BROKER_USERNAME
unset APPFORMER_JMS_CONNECTION_PARAMS
unset GIT_HOOKS_DIR
unset KIE_CONTROLLER_OCP_ENABLED
unset KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
unset KIE_CONTROLLER_TEMPLATE_CACHE_TTL
unset_kie_security_env
unset KIE_SERVER_CONTROLLER_HOST
unset KIE_SERVER_CONTROLLER_OPENSHIFT_GLOBAL_DISCOVERY_ENABLED
unset KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE
unset KIE_SERVER_CONTROLLER_PORT
unset KIE_SERVER_CONTROLLER_PROTOCOL
unset KIE_SERVER_CONTROLLER_SERVICE
unset KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL
unset KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED
}

function configureEnv() {
Expand Down Expand Up @@ -114,13 +115,15 @@ function configure_server_access() {
}

function configure_openshift_enhancement() {
local kscOpenShiftEnabled=$(find_env "KIE_CONTROLLER_OCP_ENABLED" "false")
local kscPreferKieService=$(find_env "KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE" "false")
local kscTemplateCacheTTL=$(find_env "KIE_CONTROLLER_TEMPLATE_CACHE_TTL" "60000")
local kscGlobalDiscoveryEnabled=$(find_env "KIE_SERVER_CONTROLLER_OPENSHIFT_GLOBAL_DISCOVERY_ENABLED" "false")
local kscPreferKieService=$(find_env "KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE" "false")
local kscTemplateCacheTTL=$(find_env "KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL" "60000")
local kscOpenShiftEnabled=$(find_env "KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED" "false")

JBOSS_KIE_ARGS="${JBOSS_KIE_ARGS} -Dorg.kie.workbench.controller.openshift.enabled=${kscOpenShiftEnabled}"
JBOSS_KIE_ARGS="${JBOSS_KIE_ARGS} -Dorg.kie.server.controller.openshift.global.discovery.enabled=${kscGlobalDiscoveryEnabled}"
JBOSS_KIE_ARGS="${JBOSS_KIE_ARGS} -Dorg.kie.server.controller.openshift.prefer.kieserver.service=${kscPreferKieService}"
JBOSS_KIE_ARGS="${JBOSS_KIE_ARGS} -Dorg.kie.server.controller.template.cache.ttl=${kscTemplateCacheTTL}"
JBOSS_KIE_ARGS="${JBOSS_KIE_ARGS} -Dorg.kie.workbench.controller.openshift.enabled=${kscOpenShiftEnabled}"
}

function configure_workbench_profile() {
Expand Down
17 changes: 10 additions & 7 deletions tests/features/rhpam/businesscentral-monitoring/rhpam-businesscentral-monitoring.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,15 @@ Feature: RHPAM Business Central Monitoring configuration tests
Then file /opt/eap/standalone/configuration/standalone-openshift.xml should contain <login-module code="org.kie.security.jaas.KieLoginModule"

# https://issues.jboss.org/browse/JBPM-7834
# https://issues.jboss.org/projects/JBPM/issues/JBPM-8269
Scenario: Check OpenShiftStartupStrategy is enabled in RHPAM 7
When container is started with env
| variable | value |
| KIE_CONTROLLER_OCP_ENABLED | true |
| KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE | false |
| KIE_CONTROLLER_TEMPLATE_CACHE_TTL | 60000 |
Then container log should contain -Dorg.kie.workbench.controller.openshift.enabled=true
Then container log should contain -Dorg.kie.server.controller.openshift.prefer.kieserver.service=false
Then container log should contain -Dorg.kie.server.controller.template.cache.ttl=60000
| variable | value |
| KIE_SERVER_CONTROLLER_OPENSHIFT_GLOBAL_DISCOVERY_ENABLED | true |
| KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE | true |
| KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL | 10000 |
| KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED | true |
Then container log should contain -Dorg.kie.server.controller.openshift.global.discovery.enabled=true
Then container log should contain -Dorg.kie.server.controller.openshift.prefer.kieserver.service=true
Then container log should contain -Dorg.kie.server.controller.template.cache.ttl=10000
Then container log should contain -Dorg.kie.workbench.controller.openshift.enabled=true
17 changes: 10 additions & 7 deletions tests/features/rhpam/businesscentral/rhpam-businesscentral.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,18 @@ Feature: RHPAM Business Central configuration tests
Then file /opt/eap/standalone/configuration/standalone-openshift.xml should contain <login-module code="org.kie.security.jaas.KieLoginModule"

# https://issues.jboss.org/browse/JBPM-7834
# https://issues.jboss.org/projects/JBPM/issues/JBPM-8269
Scenario: Check OpenShiftStartupStrategy is enabled in RHPAM 7
When container is started with env
| variable | value |
| KIE_CONTROLLER_OCP_ENABLED | true |
| KIE_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE | false |
| KIE_CONTROLLER_TEMPLATE_CACHE_TTL | 60000 |
Then container log should contain -Dorg.kie.workbench.controller.openshift.enabled=true
Then container log should contain -Dorg.kie.server.controller.openshift.prefer.kieserver.service=false
Then container log should contain -Dorg.kie.server.controller.template.cache.ttl=60000
| variable | value |
| KIE_SERVER_CONTROLLER_OPENSHIFT_GLOBAL_DISCOVERY_ENABLED | true |
| KIE_SERVER_CONTROLLER_OPENSHIFT_PREFER_KIESERVER_SERVICE | true |
| KIE_SERVER_CONTROLLER_TEMPLATE_CACHE_TTL | 10000 |
| KIE_WORKBENCH_CONTROLLER_OPENSHIFT_ENABLED | true |
Then container log should contain -Dorg.kie.server.controller.openshift.global.discovery.enabled=true
Then container log should contain -Dorg.kie.server.controller.openshift.prefer.kieserver.service=true
Then container log should contain -Dorg.kie.server.controller.template.cache.ttl=10000
Then container log should contain -Dorg.kie.workbench.controller.openshift.enabled=true

# https://issues.jboss.org/browse/RHDM-871
Scenario: Check Workbench profile for rhpam
Expand Down