From 13b546315325750230ea4762fbfa5adc362cea68 Mon Sep 17 00:00:00 2001 From: Martin Kanis Date: Thu, 21 Nov 2019 10:48:57 +0100 Subject: [PATCH] KEYCLOAK-11863 ConfigMigrationTest wrong assertion for Standalone configuration --- .../main/resources/content/bin/migrate-standalone-ha.cli | 9 ++++++++- .../main/resources/content/bin/migrate-standalone.cli | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone-ha.cli b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone-ha.cli index 8f7952fb6a..d2e52bee17 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone-ha.cli +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone-ha.cli @@ -670,10 +670,17 @@ if (outcome == failed) of /subsystem=microprofile-metrics-smallrye/:read-resourc /subsystem=microprofile-metrics-smallrye/:add /subsystem=microprofile-metrics-smallrye/:write-attribute(name=security-enabled,value=false) /subsystem=microprofile-metrics-smallrye/:write-attribute(name=exposed-subsystems,value=[*]) - /subsystem=microprofile-metrics-smallrye/:write-attribute(name=prefix,value=${wildfly.metrics.prefix:wildfly}) echo end-if +if (result == "Keycloak") of :read-attribute(name=product-name) + echo Adding microprofile-metrics-smallrye subsystem prefix attribute to Keycloak + /subsystem=microprofile-metrics-smallrye/:write-attribute(name=prefix,value=${wildfly.metrics.prefix:wildfly}) +else + echo Adding microprofile-metrics-smallrye subsystem prefix attribute to RH-SSO + /subsystem=microprofile-metrics-smallrye/:write-attribute(name=prefix,value=${wildfly.metrics.prefix:jboss}) +end-if + # Migrate from 6.0.1 to 7.0.0 if (outcome == success) of /subsystem=ejb3/service=remote/channel-creation-options=READ_TIMEOUT/:read-resource echo Removing READ_TIMEOUT option from remote service from ejb3 subsystem diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone.cli b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone.cli index 672f3d54b9..75e7750dc2 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone.cli +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone.cli @@ -559,10 +559,17 @@ if (outcome == failed) of /subsystem=microprofile-metrics-smallrye/:read-resourc /subsystem=microprofile-metrics-smallrye/:add /subsystem=microprofile-metrics-smallrye/:write-attribute(name=security-enabled,value=false) /subsystem=microprofile-metrics-smallrye/:write-attribute(name=exposed-subsystems,value=[*]) - /subsystem=microprofile-metrics-smallrye/:write-attribute(name=prefix,value=${wildfly.metrics.prefix:wildfly}) echo end-if +if (result == "Keycloak") of :read-attribute(name=product-name) + echo Adding microprofile-metrics-smallrye subsystem prefix attribute to Keycloak + /subsystem=microprofile-metrics-smallrye/:write-attribute(name=prefix,value=${wildfly.metrics.prefix:wildfly}) +else + echo Adding microprofile-metrics-smallrye subsystem prefix attribute to RH-SSO + /subsystem=microprofile-metrics-smallrye/:write-attribute(name=prefix,value=${wildfly.metrics.prefix:jboss}) +end-if + # Migrate from 6.0.1 to 7.0.0 if (outcome == success) of /subsystem=ejb3/service=remote/channel-creation-options=READ_TIMEOUT/:read-resource echo Removing READ_TIMEOUT option from remote service from ejb3 subsystem