diff --git a/openshift/topics/tutorials.adoc b/openshift/topics/tutorials.adoc index 1816a46182..8ceaaba09b 100644 --- a/openshift/topics/tutorials.adoc +++ b/openshift/topics/tutorials.adoc @@ -18,7 +18,7 @@ By default the database is automatically migrated when you start {project_name} [[automatic-db-migration]] ==== Automatic Database Migration -This process assumes that you are link:https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html-single/red_hat_single_sign-on_for_openshift/index#Example-Deploying-SSO[running] some previous version of the {project_openshift_product_name} image, backed by MySQL or PostgreSQL database (deployed in ephemeral or persistent mode), running on a separate pod. +This process assumes that you are link:{openshift_link}#Example-Deploying-SSO[running] some previous version of the {project_openshift_product_name} image, backed by MySQL or PostgreSQL database (deployed in ephemeral or persistent mode), running on a separate pod. [IMPORTANT] ==== @@ -97,7 +97,7 @@ See link:https://access.redhat.com/documentation/en-us/red_hat_single_sign-on/7. The database migration process handles the data schema update and performs manipulation of the data, therefore, stop all pods running the previous version of the {project_openshift_product_name} image before dynamic generation of the SQL migration file. ==== -This process assumes that you are link:https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html-single/red_hat_single_sign-on_for_openshift/index#Example-Deploying-SSO[running] some previous version of the {project_openshift_product_name} image, backed by MySQL or PostgreSQL database (deployed in ephemeral or persistent mode), running on a separate pod. +This process assumes that you are link:{openshift_link}#Example-Deploying-SSO[running] some previous version of the {project_openshift_product_name} image, backed by MySQL or PostgreSQL database (deployed in ephemeral or persistent mode), running on a separate pod. Perform the following to generate and get the SQL migration file for the database: @@ -810,7 +810,7 @@ The following example uses both link:https://github.com/keycloak/keycloak-quicks [IMPORTANT] ==== -This guide assumes the {project_openshift_product_name} image has been previously link:https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html-single/red_hat_single_sign-on_for_openshift/index#Example-Deploying-SSO[deployed using one of the following templates:] +This guide assumes the {project_openshift_product_name} image has been previously link:{openshift_link}#Example-Deploying-SSO[deployed using one of the following templates:] * *_{project_templates_version}-mysql_* * *_{project_templates_version}-mysql-persistent_* @@ -906,7 +906,7 @@ $ oc new-project eap-app-demo ---- $ oc policy add-role-to-user view system:serviceaccount:$(oc project -q):default ---- -. The EAP template requires an link:https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html-single/red_hat_single_sign-on_for_openshift/index#Configuring-Keystores[SSL keystore and a JGroups keystore]. This example uses `keytool`, a package included with the Java Development Kit, to generate self-signed certificates for these keystores. +. The EAP template requires an link:{openshift_link}#Configuring-Keystores[SSL keystore and a JGroups keystore]. This example uses `keytool`, a package included with the Java Development Kit, to generate self-signed certificates for these keystores. .. Generate a secure key for the SSL keystore (this example uses `password` as password for the keystore). + [source,bash,subs="attributes+,macros+"] diff --git a/pom.xml b/pom.xml index 4e3f6f59eb..3a94945887 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,6 @@ server_installation release_notes upgrading - openshift aggregation tests @@ -56,6 +55,9 @@ master rhsso-images + + openshift + latest diff --git a/release_notes/master.adoc b/release_notes/master.adoc index fb4c088ee4..1bcb316a5a 100644 --- a/release_notes/master.adoc +++ b/release_notes/master.adoc @@ -8,47 +8,6 @@ include::topics/templates/document-attributes-product.adoc[] = {releasenotes_name} -ifeval::[{project_product_cd}==false] +== {project_name_full} 7.3.0.GA -== {project_name_full} 7.3 - -include::topics/7_3_final.adoc[leveloffset=2] - -endif::[] - -ifeval::[{project_product_cd}==true] - -== {project_name_full} 8 - -include::topics/8_0_0.adoc[leveloffset=2] - -== {project_name_full} 7 - -include::topics/7_0_0.adoc[leveloffset=2] - -== {project_name_full} 6 - -include::topics/6_0_0.adoc[leveloffset=2] - -== {project_name_full} 7.3.CD05 - -include::topics/5_0_0.adoc[leveloffset=2] -include::topics/4_8_0_final.adoc[leveloffset=2] -include::topics/4_7_0_final.adoc[leveloffset=2] - -== {project_name_full} 7.3.CD04 - -include::topics/4_6_0_final.adoc[leveloffset=2] -include::topics/4_5_0_final.adoc[leveloffset=2] -include::topics/4_4_0_final.adoc[leveloffset=2] - -== {project_name_full} 7.3.CD03 - -include::topics/4_3_0_final.adoc[leveloffset=2] -include::topics/4_2_0_final.adoc[leveloffset=2] -include::topics/4_1_0_final.adoc[leveloffset=2] - -== {project_name_full} 7.3.CD02 -include::topics/4_0_0_final.adoc[leveloffset=2] -include::topics/4_0_0_beta3.adoc[leveloffset=2] -endif::[] \ No newline at end of file +include::topics/product/7_3_final.adoc[leveloffset=2] \ No newline at end of file diff --git a/release_notes/topics/7_3_final.adoc b/release_notes/topics/product/7_3_final.adoc similarity index 100% rename from release_notes/topics/7_3_final.adoc rename to release_notes/topics/product/7_3_final.adoc diff --git a/securing_apps/topics/overview/supported-platforms.adoc b/securing_apps/topics/overview/supported-platforms.adoc index ce2b61d27e..99dec18162 100644 --- a/securing_apps/topics/overview/supported-platforms.adoc +++ b/securing_apps/topics/overview/supported-platforms.adoc @@ -36,11 +36,9 @@ ifeval::[{project_community}==true] ==== Android * https://github.com/openid/AppAuth-Android[AppAuth] (generic) -* https://github.com/aerogear/aerogear-android-authz[AeroGear] (generic) ==== iOS * https://github.com/openid/AppAuth-iOS[AppAuth] (generic) -* https://github.com/aerogear/aerogear-ios-oauth2[AeroGear] (generic) ===== Apache HTTP Server * https://github.com/zmartzone/mod_auth_openidc[mod_auth_openidc] diff --git a/tests/src/test/java/org/keycloak/documentation/test/OpenShiftTest.java b/tests/src/test/java/org/keycloak/documentation/test/OpenShiftTest.java index a97b5f7d3a..0880a8586a 100644 --- a/tests/src/test/java/org/keycloak/documentation/test/OpenShiftTest.java +++ b/tests/src/test/java/org/keycloak/documentation/test/OpenShiftTest.java @@ -1,7 +1,15 @@ package org.keycloak.documentation.test; +import org.junit.Assume; +import org.junit.BeforeClass; + public class OpenShiftTest extends AbstractDocsTest { + @BeforeClass + public static void skipOnCommunity() { + Assume.assumeTrue("Skipping product OpenShift guide testing in community", System.getProperties().containsKey("product")); + } + @Override public String getGuideDirName() { return "openshift"; diff --git a/tests/src/test/resources/guide-url-fragments-product b/tests/src/test/resources/guide-url-fragments-product index 0d09e8e5d7..55441ae6c3 100644 --- a/tests/src/test/resources/guide-url-fragments-product +++ b/tests/src/test/resources/guide-url-fragments-product @@ -6,4 +6,5 @@ server_admin=server_administration_guide server_development=server_developer_guide server_installation=server_installation_and_configuration_guide upgrading=upgrading_guide -release_notes=release_notes \ No newline at end of file +release_notes=release_notes +openshift=red_hat_single_sign-on_for_openshift \ No newline at end of file diff --git a/topics/templates/document-attributes-product.adoc b/topics/templates/document-attributes-product.adoc index f33bee5c21..61df07cf96 100644 --- a/topics/templates/document-attributes-product.adoc +++ b/topics/templates/document-attributes-product.adoc @@ -1,30 +1,17 @@ :project_community: false :project_product: true -:project_product_cd: true :project_name: Red Hat Single Sign-On :project_versionMvn: 4.8.3.Final-redhat-00001 :project_versionNpm: 4.8.3.Final-redhat-00001 :project_images: rhsso-images -ifeval::[{project_product_cd}==false] :project_name_full: Red Hat Single Sign-On -:project_version: 7.3.0.GA -:project_versionDoc: 7.3 -:project_templates_version: sso73 +:project_version: 7.4.0.GA +:project_versionDoc: 7.4 +:project_templates_version: sso74 :project_latest_image_tag: 1.0 :project_doc_base_url: https://access.redhat.com/documentation/en-us/red_hat_single_sign-on/{project_versionDoc}/html-single :maven_repository: https://maven.repository.redhat.com/ga/ -endif::[] - -ifeval::[{project_product_cd}==true] -:project_name_full: Red Hat Single Sign-On Continuous Delivery -:project_version: 8 -:project_versionDoc: 8 -:project_templates_version: sso-cd -:project_latest_image_tag: 8 -:project_doc_base_url: https://access.redhat.com/documentation/en-us/red_hat_single_sign-on_continuous_delivery/{project_versionDoc}/html-single -:maven_repository: https://maven.repository.redhat.com/earlyaccess/ -endif::[] :project_openshift_product_name: {project_name} for OpenShift