diff --git a/CHANGELOG.md b/CHANGELOG.md index 2442265..3e7b524 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added +- Added new AEM profile: aem65_sp17 - Added new AEM profile: aem65_sp18 #RS-193 +- Added new AEM profile: aem65_sp19 +- Added new AEM profile: aem65_sp20 +- Added new AEM profile: aem65_sp21 ### Changed - Update Github Action Publish Docker image to `shinesolutions/aem-platform-buildenv:4.0.1` diff --git a/docs/aem-profiles-artifacts.md b/docs/aem-profiles-artifacts.md index 56b7c46..1be6271 100644 --- a/docs/aem-profiles-artifacts.md +++ b/docs/aem-profiles-artifacts.md @@ -41,5 +41,8 @@ For AEM 6.5, the service pack file names used to have the format `AEM-6.5.x.0-6. | `aem65_sp13` | `aem65` artifacts + aem-service-pkg-6.5.13.0.zip | | `aem65_sp14` | `aem65` artifacts + aem-service-pkg-6.5.14.0.zip | | `aem65_sp16` | `aem65` artifacts + aem-service-pkg-6.5.16.0.zip | - +| `aem65_sp17` | `aem65` artifacts + aem-service-pkg-6.5.17.0.zip | | `aem65_sp18` | `aem65` artifacts + aem-service-pkg-6.5.18.0.zip | +| `aem65_sp19` | `aem65` artifacts + aem-service-pkg-6.5.19.0.zip | +| `aem65_sp20` | `aem65` artifacts + aem-service-pkg-6.5.20.0.zip | +| `aem65_sp21` | `aem65` artifacts + aem-service-pkg-6.5.21.0.zip | \ No newline at end of file diff --git a/manifests/install_aem65_sp17.pp b/manifests/install_aem65_sp17.pp new file mode 100644 index 0000000..0da66d5 --- /dev/null +++ b/manifests/install_aem65_sp17.pp @@ -0,0 +1,54 @@ +define aem_curator::install_aem65_sp17( + $aem_license_base, + $aem_artifacts_base, + $aem_healthcheck_version, + $aem_port, + $run_modes, + $tmp_dir, + $aem_debug_port = undef, + $aem_base = '/opt', + $aem_healthcheck_source = undef, + $aem_id = 'aem', + $aem_type = undef, + $aem_jvm_mem_opts = '-Xss4m -Xmx8192m', + $aem_sample_content = false, + $aem_jvm_opts = [ + '-XX:+PrintGCDetails', + '-XX:+PrintGCTimeStamps', + '-XX:+PrintGCDateStamps', + '-XX:+PrintTenuringDistribution', + '-XX:+PrintGCApplicationStoppedTime', + '-XX:+HeapDumpOnOutOfMemoryError', + ], + $aem_osgi_configs = undef, + $post_install_sleep_secs = 120, +) { + + aem_curator::install_aem65 { "${aem_id}: Install AEM": + tmp_dir => $tmp_dir, + run_modes => $run_modes, + aem_port => $aem_port, + aem_debug_port => $aem_debug_port, + aem_artifacts_base => $aem_artifacts_base, + aem_license_base => $aem_license_base, + aem_healthcheck_version => $aem_healthcheck_version, + aem_healthcheck_source => $aem_healthcheck_source, + aem_base => $aem_base, + aem_sample_content => $aem_sample_content, + aem_jvm_mem_opts => $aem_jvm_mem_opts, + aem_jvm_opts => $aem_jvm_opts, + aem_osgi_configs => $aem_osgi_configs, + post_install_sleep_secs => $post_install_sleep_secs, + aem_id => $aem_id, + aem_type => $aem_type, + } -> aem_curator::install_aem_package { "${aem_id}: Install service pack 17": + tmp_dir => $tmp_dir, + file_name => 'aem-service-pkg-6.5.17.0.zip', + package_name => 'aem-service-pkg', + package_group => 'adobe/cq650/servicepack', + package_version => '6.5.17.0', + artifacts_base => $aem_artifacts_base, + aem_id => $aem_id, + } + +} diff --git a/manifests/install_aem65_sp19.pp b/manifests/install_aem65_sp19.pp new file mode 100644 index 0000000..efb182b --- /dev/null +++ b/manifests/install_aem65_sp19.pp @@ -0,0 +1,54 @@ +define aem_curator::install_aem65_sp19( + $aem_license_base, + $aem_artifacts_base, + $aem_healthcheck_version, + $aem_port, + $run_modes, + $tmp_dir, + $aem_debug_port = undef, + $aem_base = '/opt', + $aem_healthcheck_source = undef, + $aem_id = 'aem', + $aem_type = undef, + $aem_jvm_mem_opts = '-Xss4m -Xmx8192m', + $aem_sample_content = false, + $aem_jvm_opts = [ + '-XX:+PrintGCDetails', + '-XX:+PrintGCTimeStamps', + '-XX:+PrintGCDateStamps', + '-XX:+PrintTenuringDistribution', + '-XX:+PrintGCApplicationStoppedTime', + '-XX:+HeapDumpOnOutOfMemoryError', + ], + $aem_osgi_configs = undef, + $post_install_sleep_secs = 120, +) { + + aem_curator::install_aem65 { "${aem_id}: Install AEM": + tmp_dir => $tmp_dir, + run_modes => $run_modes, + aem_port => $aem_port, + aem_debug_port => $aem_debug_port, + aem_artifacts_base => $aem_artifacts_base, + aem_license_base => $aem_license_base, + aem_healthcheck_version => $aem_healthcheck_version, + aem_healthcheck_source => $aem_healthcheck_source, + aem_base => $aem_base, + aem_sample_content => $aem_sample_content, + aem_jvm_mem_opts => $aem_jvm_mem_opts, + aem_jvm_opts => $aem_jvm_opts, + aem_osgi_configs => $aem_osgi_configs, + post_install_sleep_secs => $post_install_sleep_secs, + aem_id => $aem_id, + aem_type => $aem_type, + } -> aem_curator::install_aem_package { "${aem_id}: Install service pack 19": + tmp_dir => $tmp_dir, + file_name => 'aem-service-pkg-6.5.19.0.zip', + package_name => 'aem-service-pkg', + package_group => 'adobe/cq650/servicepack', + package_version => '6.5.19.0', + artifacts_base => $aem_artifacts_base, + aem_id => $aem_id, + } + +} diff --git a/manifests/install_aem65_sp20.pp b/manifests/install_aem65_sp20.pp new file mode 100644 index 0000000..6d66104 --- /dev/null +++ b/manifests/install_aem65_sp20.pp @@ -0,0 +1,54 @@ +define aem_curator::install_aem65_sp20( + $aem_license_base, + $aem_artifacts_base, + $aem_healthcheck_version, + $aem_port, + $run_modes, + $tmp_dir, + $aem_debug_port = undef, + $aem_base = '/opt', + $aem_healthcheck_source = undef, + $aem_id = 'aem', + $aem_type = undef, + $aem_jvm_mem_opts = '-Xss4m -Xmx8192m', + $aem_sample_content = false, + $aem_jvm_opts = [ + '-XX:+PrintGCDetails', + '-XX:+PrintGCTimeStamps', + '-XX:+PrintGCDateStamps', + '-XX:+PrintTenuringDistribution', + '-XX:+PrintGCApplicationStoppedTime', + '-XX:+HeapDumpOnOutOfMemoryError', + ], + $aem_osgi_configs = undef, + $post_install_sleep_secs = 120, +) { + + aem_curator::install_aem65 { "${aem_id}: Install AEM": + tmp_dir => $tmp_dir, + run_modes => $run_modes, + aem_port => $aem_port, + aem_debug_port => $aem_debug_port, + aem_artifacts_base => $aem_artifacts_base, + aem_license_base => $aem_license_base, + aem_healthcheck_version => $aem_healthcheck_version, + aem_healthcheck_source => $aem_healthcheck_source, + aem_base => $aem_base, + aem_sample_content => $aem_sample_content, + aem_jvm_mem_opts => $aem_jvm_mem_opts, + aem_jvm_opts => $aem_jvm_opts, + aem_osgi_configs => $aem_osgi_configs, + post_install_sleep_secs => $post_install_sleep_secs, + aem_id => $aem_id, + aem_type => $aem_type, + } -> aem_curator::install_aem_package { "${aem_id}: Install service pack 20": + tmp_dir => $tmp_dir, + file_name => 'aem-service-pkg-6.5.20.0.zip', + package_name => 'aem-service-pkg', + package_group => 'adobe/cq650/servicepack', + package_version => '6.5.20.0', + artifacts_base => $aem_artifacts_base, + aem_id => $aem_id, + } + +} diff --git a/manifests/install_aem65_sp21.pp b/manifests/install_aem65_sp21.pp new file mode 100644 index 0000000..6515f7e --- /dev/null +++ b/manifests/install_aem65_sp21.pp @@ -0,0 +1,54 @@ +define aem_curator::install_aem65_sp21( + $aem_license_base, + $aem_artifacts_base, + $aem_healthcheck_version, + $aem_port, + $run_modes, + $tmp_dir, + $aem_debug_port = undef, + $aem_base = '/opt', + $aem_healthcheck_source = undef, + $aem_id = 'aem', + $aem_type = undef, + $aem_jvm_mem_opts = '-Xss4m -Xmx8192m', + $aem_sample_content = false, + $aem_jvm_opts = [ + '-XX:+PrintGCDetails', + '-XX:+PrintGCTimeStamps', + '-XX:+PrintGCDateStamps', + '-XX:+PrintTenuringDistribution', + '-XX:+PrintGCApplicationStoppedTime', + '-XX:+HeapDumpOnOutOfMemoryError', + ], + $aem_osgi_configs = undef, + $post_install_sleep_secs = 120, +) { + + aem_curator::install_aem65 { "${aem_id}: Install AEM": + tmp_dir => $tmp_dir, + run_modes => $run_modes, + aem_port => $aem_port, + aem_debug_port => $aem_debug_port, + aem_artifacts_base => $aem_artifacts_base, + aem_license_base => $aem_license_base, + aem_healthcheck_version => $aem_healthcheck_version, + aem_healthcheck_source => $aem_healthcheck_source, + aem_base => $aem_base, + aem_sample_content => $aem_sample_content, + aem_jvm_mem_opts => $aem_jvm_mem_opts, + aem_jvm_opts => $aem_jvm_opts, + aem_osgi_configs => $aem_osgi_configs, + post_install_sleep_secs => $post_install_sleep_secs, + aem_id => $aem_id, + aem_type => $aem_type, + } -> aem_curator::install_aem_package { "${aem_id}: Install service pack 21": + tmp_dir => $tmp_dir, + file_name => 'aem-service-pkg-6.5.21.0.zip', + package_name => 'aem-service-pkg', + package_group => 'adobe/cq650/servicepack', + package_version => '6.5.21.0', + artifacts_base => $aem_artifacts_base, + aem_id => $aem_id, + } + +}