From aac0871040d7919fe9082e0c427859d61f5c5ee8 Mon Sep 17 00:00:00 2001 From: Edwin Biemond Date: Wed, 7 Dec 2016 21:06:47 +0100 Subject: [PATCH 1/4] Getting ready for new release and some state_attrs fixes --- fmw_bsu/metadata.rb | 2 +- fmw_domain/metadata.rb | 2 +- fmw_inst/metadata.rb | 2 +- fmw_inst/resources/fmw_install_solaris.rb | 2 +- fmw_jdk/metadata.rb | 2 +- fmw_opatch/metadata.rb | 2 +- fmw_rcu/metadata.rb | 2 +- fmw_rcu/resources/repository.rb | 2 +- fmw_rcu/resources/repository_windows.rb | 2 +- fmw_wls/metadata.rb | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/fmw_bsu/metadata.rb b/fmw_bsu/metadata.rb index 0199ce6..da04690 100644 --- a/fmw_bsu/metadata.rb +++ b/fmw_bsu/metadata.rb @@ -4,7 +4,7 @@ license 'MIT' description 'Patch Oracle WebLogic 10.3.6 or 12.1.1' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.2' +version '0.1.3' recipe "fmw_bsu", "This is an empty recipe and does not do anything" diff --git a/fmw_domain/metadata.rb b/fmw_domain/metadata.rb index 75f918f..e0b3088 100644 --- a/fmw_domain/metadata.rb +++ b/fmw_domain/metadata.rb @@ -4,7 +4,7 @@ license 'MIT' description 'Create a WebLogic (FMW) Domain with FMW extensions on a Windows, Linux or Solaris host' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.2' +version '0.1.3' recipe "fmw_domain", "This is an empty recipe and does not do anything" diff --git a/fmw_inst/metadata.rb b/fmw_inst/metadata.rb index f33edd8..12c4f68 100644 --- a/fmw_inst/metadata.rb +++ b/fmw_inst/metadata.rb @@ -4,7 +4,7 @@ license 'MIT' description 'Installs FMW Software on a WebLogic middleware environmment' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.2' +version '0.1.3' recipe "fmw_inst", "This is an empty recipe and does not do anything" diff --git a/fmw_inst/resources/fmw_install_solaris.rb b/fmw_inst/resources/fmw_install_solaris.rb index 9485526..1292d07 100644 --- a/fmw_inst/resources/fmw_install_solaris.rb +++ b/fmw_inst/resources/fmw_install_solaris.rb @@ -31,6 +31,6 @@ # tmp folder attribute :tmp_dir, kind_of: String, required: true -state_attrs :java_home_dir, :middleware_home_dir, :version, :os_user, :os_group, :orainst_dir, :tmp_dir, :rsp_file +state_attrs :java_home_dir, :oracle_home_dir, :version, :os_user, :os_group, :orainst_dir, :tmp_dir, :rsp_file attr_accessor :exists diff --git a/fmw_jdk/metadata.rb b/fmw_jdk/metadata.rb index 406c7da..7d1cfee 100644 --- a/fmw_jdk/metadata.rb +++ b/fmw_jdk/metadata.rb @@ -4,7 +4,7 @@ license 'MIT' description 'Installs Oracle JDK 7,8 on any Windows, Linux or Solaris host' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.2' +version '0.1.3' recipe "fmw_jdk", "This is an empty recipe and does not do anything" diff --git a/fmw_opatch/metadata.rb b/fmw_opatch/metadata.rb index 3220747..76ca8b0 100644 --- a/fmw_opatch/metadata.rb +++ b/fmw_opatch/metadata.rb @@ -4,7 +4,7 @@ license 'MIT' description 'Patch Oracle WebLogic 12c or any FMW 11g or 12c product' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.2' +version '0.1.3' recipe "fmw_opatch", "This is an empty recipe and does not do anything" diff --git a/fmw_rcu/metadata.rb b/fmw_rcu/metadata.rb index e1f606e..30ec028 100644 --- a/fmw_rcu/metadata.rb +++ b/fmw_rcu/metadata.rb @@ -4,7 +4,7 @@ license 'MIT' description 'Installs Oracle WebLogic 11g,12c on any Windows, Linux or Solaris host' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.2' +version '0.1.3' recipe "fmw_rcu", "This is an empty recipe and does not do anything" diff --git a/fmw_rcu/resources/repository.rb b/fmw_rcu/resources/repository.rb index 2c1d9bf..1a6d2b3 100644 --- a/fmw_rcu/resources/repository.rb +++ b/fmw_rcu/resources/repository.rb @@ -41,6 +41,6 @@ # tmp folder attribute :tmp_dir, kind_of: String, required: true -state_attrs :java_home_dir, :oracle_home_dir, :db_connect_url, :jdbc_connect_url, :db_connect_user, :rcu_prefix, :rcu_components, :os_user, :os_group, :tmp_dir +state_attrs :java_home_dir, :middleware_home_dir, :db_connect_url, :jdbc_connect_url, :db_connect_user, :rcu_prefix, :rcu_components, :os_user, :os_group, :tmp_dir attr_accessor :exists diff --git a/fmw_rcu/resources/repository_windows.rb b/fmw_rcu/resources/repository_windows.rb index a185107..63dc0b7 100644 --- a/fmw_rcu/resources/repository_windows.rb +++ b/fmw_rcu/resources/repository_windows.rb @@ -37,6 +37,6 @@ # tmp folder attribute :tmp_dir, kind_of: String, required: true -state_attrs :java_home_dir, :oracle_home_dir, :jdbc_connect_url, :db_connect_url, :db_connect_user, :rcu_prefix, :rcu_components, :tmp_dir +state_attrs :java_home_dir, :middleware_home_dir, :jdbc_connect_url, :db_connect_url, :db_connect_user, :rcu_prefix, :rcu_components, :tmp_dir attr_accessor :exists diff --git a/fmw_wls/metadata.rb b/fmw_wls/metadata.rb index 5e5ff3a..01e634b 100644 --- a/fmw_wls/metadata.rb +++ b/fmw_wls/metadata.rb @@ -4,7 +4,7 @@ license 'MIT' description 'Installs Oracle WebLogic 11g, 12c on any Windows, Linux or Solaris host' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.2' +version '0.1.3' recipe "fmw_wls", "This is an empty recipe and does not do anything" From fe6e46983006f1a18f8321fd9625d29ef94583b6 Mon Sep 17 00:00:00 2001 From: Edwin Biemond Date: Wed, 7 Dec 2016 21:11:13 +0100 Subject: [PATCH 2/4] Update change log --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3076cc1..33ffa0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## chef-samples v0.1.3 (6 Dec 2016) + +- state_attr fixes in some resources +- fmw_inst fix in version + ## chef-samples v0.1.2 (12 Jul 2016) - Support for WebLogic/FMW 12.2.1.1 From 70eb71b4a9c8935469fd1787066528e6f5a60abe Mon Sep 17 00:00:00 2001 From: Edwin Biemond Date: Wed, 7 Dec 2016 21:38:31 +0100 Subject: [PATCH 3/4] Added was/fmw 12.2.1.2 support --- CHANGELOG.md | 1 + fmw_domain/README.md | 2 +- fmw_domain/libraries/helper.rb | 4 ++-- fmw_domain/recipes/domain.rb | 2 +- fmw_domain/recipes/extension_bam.rb | 2 +- fmw_domain/recipes/extension_enterprise_scheduler.rb | 2 +- fmw_domain/recipes/extension_jrf.rb | 2 +- fmw_domain/recipes/extension_service_bus.rb | 2 +- fmw_domain/recipes/extension_soa_suite.rb | 2 +- fmw_domain/recipes/extension_webtier.rb | 2 +- fmw_domain/templates/default/domain/extensions/bam.py | 4 ++-- .../templates/default/domain/extensions/service_bus.py | 4 ++-- .../templates/default/domain/extensions/soa_suite.py | 4 ++-- fmw_inst/definitions/fmw_install.rb | 4 ++-- fmw_inst/recipes/jrf.rb | 2 +- fmw_inst/recipes/mft.rb | 8 +++++--- fmw_inst/recipes/service_bus.rb | 8 +++++--- fmw_inst/recipes/soa_suite.rb | 8 +++++--- fmw_inst/recipes/webcenter.rb | 4 +++- fmw_opatch/recipes/service_bus.rb | 2 +- fmw_opatch/recipes/soa_suite.rb | 2 +- fmw_rcu/recipes/common.rb | 4 ++-- fmw_rcu/recipes/soa_suite.rb | 4 ++-- fmw_wls/README.md | 4 ++-- fmw_wls/attributes/default.rb | 2 +- fmw_wls/definitions/wls_install.rb | 4 ++-- fmw_wls/providers/wls_linux.rb | 2 +- fmw_wls/providers/wls_solaris.rb | 2 +- fmw_wls/providers/wls_windows.rb | 2 +- 29 files changed, 52 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33ffa0d..6736332 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## chef-samples v0.1.3 (6 Dec 2016) +- support for WebLogic/FMW 12.2.1.2 - state_attr fixes in some resources - fmw_inst fix in version diff --git a/fmw_domain/README.md b/fmw_domain/README.md index fa23619..bfaf5b0 100644 --- a/fmw_domain/README.md +++ b/fmw_domain/README.md @@ -28,7 +28,7 @@ The fmw_domain cookbook allows you to create a WebLogic (FMW) Domain with FMW ex ## Cookbook description -This cookbook allows you to create a WebLogic (FMW) Domain (10.3.6, 12.1.1) or 12c (12.1.2, 12.1.3, 12.2.1, 12.2.1.1 ) on any Windows, Linux or Solaris host or VM. +This cookbook allows you to create a WebLogic (FMW) Domain (10.3.6, 12.1.1) or 12c (12.1.2, 12.1.3, 12.2.1, 12.2.1.1, 12.2.1.2 ) on any Windows, Linux or Solaris host or VM. ## Setup diff --git a/fmw_domain/libraries/helper.rb b/fmw_domain/libraries/helper.rb index 63e09dc..9ffce3e 100644 --- a/fmw_domain/libraries/helper.rb +++ b/fmw_domain/libraries/helper.rb @@ -18,7 +18,7 @@ def self.listening?(command, port, column) end def self.wlst_execute(version, os_user, script_file, weblogic_home_dir, weblogic_password, repository_password) - if version == '12.2.1' or version == '12.2.1.1' + if version == '12.2.1' or version == '12.2.1.1' or version == '12.2.1.2' wlst_script_dir = "#{weblogic_home_dir}/../oracle_common/common/bin" else wlst_script_dir = "#{weblogic_home_dir}/common/bin" @@ -30,7 +30,7 @@ def self.wlst_execute(version, os_user, script_file, weblogic_home_dir, weblogic end def self.wlst_execute_windows(version, script_file, weblogic_home_dir, weblogic_password, repository_password) - if version == '12.2.1' or version == '12.2.1.1' + if version == '12.2.1' or version == '12.2.1.1' or version == '12.2.1.2' wlst_script_dir = "#{weblogic_home_dir}\\..\\oracle_common\\common\\bin" else wlst_script_dir = "#{weblogic_home_dir}\\common\\bin" diff --git a/fmw_domain/recipes/domain.rb b/fmw_domain/recipes/domain.rb index e36cf06..116044d 100644 --- a/fmw_domain/recipes/domain.rb +++ b/fmw_domain/recipes/domain.rb @@ -41,7 +41,7 @@ fail 'did not find the data_bag_item' if domain_params.length == 0 -if ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version']) wls_base_template = "#{node['fmw']['weblogic_home_dir']}/common/templates/wls/wls.jar" elsif ['10.3.6', '12.1.1'].include?(node['fmw']['version']) wls_base_template = "#{node['fmw']['weblogic_home_dir']}/common/templates/domains/wls.jar" diff --git a/fmw_domain/recipes/extension_bam.rb b/fmw_domain/recipes/extension_bam.rb index b4c6baf..5d04704 100644 --- a/fmw_domain/recipes/extension_bam.rb +++ b/fmw_domain/recipes/extension_bam.rb @@ -52,7 +52,7 @@ bpm_enabled = true if node['fmw_domain']['soa_suite_install_type'] == 'BPM' end -if ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version']) if node['fmw']['version'] == '12.1.2' return elsif node['fmw']['version'] == '12.1.3' diff --git a/fmw_domain/recipes/extension_enterprise_scheduler.rb b/fmw_domain/recipes/extension_enterprise_scheduler.rb index f07a8ce..1ff0c3b 100644 --- a/fmw_domain/recipes/extension_enterprise_scheduler.rb +++ b/fmw_domain/recipes/extension_enterprise_scheduler.rb @@ -44,7 +44,7 @@ bam_cluster = '' end -if ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version']) if node['fmw']['version'] == '12.1.2' return elsif node['fmw']['version'] == '12.1.3' diff --git a/fmw_domain/recipes/extension_jrf.rb b/fmw_domain/recipes/extension_jrf.rb index bfd914c..36fbaf8 100644 --- a/fmw_domain/recipes/extension_jrf.rb +++ b/fmw_domain/recipes/extension_jrf.rb @@ -21,7 +21,7 @@ restricted = false -if ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version']) if node['fmw']['version'] == '12.1.2' wls_em_template = "#{node['fmw']['middleware_home_dir']}/em/common/templates/wls/oracle.em_wls_template_12.1.2.jar" wls_jrf_template = "#{node['fmw']['middleware_home_dir']}/oracle_common/common/templates/wls/oracle.jrf_template_12.1.2.jar" diff --git a/fmw_domain/recipes/extension_service_bus.rb b/fmw_domain/recipes/extension_service_bus.rb index 194ad08..aba22e0 100644 --- a/fmw_domain/recipes/extension_service_bus.rb +++ b/fmw_domain/recipes/extension_service_bus.rb @@ -52,7 +52,7 @@ bpm_enabled = true if node['fmw_domain']['soa_suite_install_type'] == 'BPM' end -if ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version']) if node['fmw']['version'] == '12.1.2' return elsif node['fmw']['version'] == '12.1.3' diff --git a/fmw_domain/recipes/extension_soa_suite.rb b/fmw_domain/recipes/extension_soa_suite.rb index c99452a..d56de1a 100644 --- a/fmw_domain/recipes/extension_soa_suite.rb +++ b/fmw_domain/recipes/extension_soa_suite.rb @@ -52,7 +52,7 @@ bpm_enabled = true if node['fmw_domain']['soa_suite_install_type'] == 'BPM' end -if ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version']) if node['fmw']['version'] == '12.1.2' return elsif node['fmw']['version'] == '12.1.3' diff --git a/fmw_domain/recipes/extension_webtier.rb b/fmw_domain/recipes/extension_webtier.rb index de8babc..21eb4d3 100644 --- a/fmw_domain/recipes/extension_webtier.rb +++ b/fmw_domain/recipes/extension_webtier.rb @@ -21,7 +21,7 @@ restricted = false -if ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version']) if node['fmw']['version'] == '12.1.2' wls_em_template = "#{node['fmw']['middleware_home_dir']}/em/common/templates/wls/oracle.em_wls_template_12.1.2.jar" wls_webtier_template = "#{node['fmw']['middleware_home_dir']}/ohs/common/templates/wls/ohs_managed_template_12.1.2.jar" diff --git a/fmw_domain/templates/default/domain/extensions/bam.py b/fmw_domain/templates/default/domain/extensions/bam.py index f5e99ca..4a370ab 100644 --- a/fmw_domain/templates/default/domain/extensions/bam.py +++ b/fmw_domain/templates/default/domain/extensions/bam.py @@ -114,7 +114,7 @@ serverGroup = ["BAM12-MGD-SVRS"] if BAM_CLUSTER: - if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1']: + if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']: cleanJMS('UMSJMSSystemResource', 'UMSJMSServer_auto', 'UMSJMSFileStore_auto') print 'Add server group BAM-MGD-SVRS to cluster' @@ -158,7 +158,7 @@ closeDomain() readDomain(DOMAIN_PATH) - if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1']: + if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']: cd('/') cleanJMS('BamCQServiceJmsSystemModule', None, None) cleanJMS('UMSJMSSystemResource', 'UMSJMSServer_auto', 'UMSJMSFileStore_auto') diff --git a/fmw_domain/templates/default/domain/extensions/service_bus.py b/fmw_domain/templates/default/domain/extensions/service_bus.py index da667b7..d3c2236 100644 --- a/fmw_domain/templates/default/domain/extensions/service_bus.py +++ b/fmw_domain/templates/default/domain/extensions/service_bus.py @@ -109,7 +109,7 @@ serverGroup = ["OSB-MGD-SVRS-COMBINED"] if OSB_CLUSTER: - if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1']: + if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']: cleanJMS('UMSJMSSystemResource', 'UMSJMSServer_auto', 'UMSJMSFileStore_auto') print 'Add server group OSB-MGD-SVRS-COMBINED to cluster' @@ -148,7 +148,7 @@ cd('/') delete('osb_server1', 'Server') - if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1']: + if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']: updateDomain() dumpStack() diff --git a/fmw_domain/templates/default/domain/extensions/soa_suite.py b/fmw_domain/templates/default/domain/extensions/soa_suite.py index 6bcd95f..7670839 100644 --- a/fmw_domain/templates/default/domain/extensions/soa_suite.py +++ b/fmw_domain/templates/default/domain/extensions/soa_suite.py @@ -156,7 +156,7 @@ serverGroup = ["SOA-MGD-SVRS"] if SOA_CLUSTER: - if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1']: + if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']: cleanJMS('UMSJMSSystemResource', 'UMSJMSServer_auto', 'UMSJMSFileStore_auto') print 'Add server group SOA-MGD-SVRS to cluster' @@ -195,7 +195,7 @@ cd('/') delete('soa_server1', 'Server') - if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1']: + if WEBLOGIC_VERSION in ['12.2.1', '12.2.1.1', '12.2.1.2']: updateDomain() dumpStack() diff --git a/fmw_inst/definitions/fmw_install.rb b/fmw_inst/definitions/fmw_install.rb index 45bc245..9a0b59c 100644 --- a/fmw_inst/definitions/fmw_install.rb +++ b/fmw_inst/definitions/fmw_install.rb @@ -20,7 +20,7 @@ group params[:os_group] cwd params[:tmp_dir] end - elsif ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(params[:version]) + elsif ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(params[:version]) execute "Install #{params[:name]}" do command "#{params[:java_home_dir]}/bin/java #{java_params} -Xmx1024m -Djava.io.tmpdir=#{params[:tmp_dir]} -jar #{params[:installer_file]} -waitforcompletion -silent -responseFile #{params[:rsp_file]} -invPtrLoc #{params[:orainst_dir]}/oraInst.loc -jreLoc #{params[:java_home_dir]}" user params[:os_user] @@ -34,7 +34,7 @@ command "#{params[:installer_file]} -silent -response #{params[:rsp_file]} -waitforcompletion -jreLoc #{params[:java_home_dir]} -ignoreSysPrereqs -Djava.io.tmpdir=#{params[:tmp_dir]}" cwd params[:tmp_dir] end - elsif ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(params[:version]) + elsif ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(params[:version]) execute "Install #{params[:name]}" do command "#{params[:java_home_dir]}\\bin\\java.exe -Xmx1024m -Djava.io.tmpdir=#{params[:tmp_dir]} -jar #{params[:installer_file]} -waitforcompletion -silent -responseFile #{params[:rsp_file]} -jreLoc #{params[:java_home_dir]}" cwd params[:tmp_dir] diff --git a/fmw_inst/recipes/jrf.rb b/fmw_inst/recipes/jrf.rb index 4451545..18d544f 100644 --- a/fmw_inst/recipes/jrf.rb +++ b/fmw_inst/recipes/jrf.rb @@ -10,7 +10,7 @@ fail 'fmw_inst attributes cannot be empty' unless node.attribute?('fmw_inst') -if ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(node['fmw']['version']) return elsif ['10.3.6'].include?(node['fmw']['version']) diff --git a/fmw_inst/recipes/mft.rb b/fmw_inst/recipes/mft.rb index 37487b0..00ba256 100644 --- a/fmw_inst/recipes/mft.rb +++ b/fmw_inst/recipes/mft.rb @@ -10,7 +10,7 @@ fail 'fmw_inst attributes cannot be empty' unless node.attribute?('fmw_inst') -if ['12.2.1', '12.2.1.1', '12.1.3'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3'].include?(node['fmw']['version']) fmw_template = 'fmw_12c.rsp' fmw_oracle_home = node['fmw']['middleware_home_dir'] + '/mft/bin' install_type = 'Typical' @@ -22,6 +22,8 @@ fmw_installer_file = node['fmw']['tmp_dir'] + '/mft/fmw_12.2.1.0.0_mft.jar' elsif node['fmw']['version'] == '12.2.1.1' fmw_installer_file = node['fmw']['tmp_dir'] + '/mft/fmw_12.2.1.1.0_mft.jar' + elsif node['fmw']['version'] == '12.2.1.2' + fmw_installer_file = node['fmw']['tmp_dir'] + '/mft/fmw_12.2.1.2.0_mft.jar' end elsif ['10.3.6'].include?(node['fmw']['version']) @@ -47,7 +49,7 @@ # chef version 11 if VERSION.start_with? '11.' - if ['12.1.3', '12.2.1', '12.2.1.1'].include?(node['fmw']['version']) + if ['12.1.3', '12.2.1', '12.2.1.1', '12.2.1.2'].include?(node['fmw']['version']) ruby_block "loading for chef 11 install mft extract" do block do if node['os'].include?('windows') @@ -87,7 +89,7 @@ end end else - if ['12.1.3', '12.2.1', '12.2.1.1'].include?(node['fmw']['version']) + if ['12.1.3', '12.2.1', '12.2.1.1', '12.2.1.2'].include?(node['fmw']['version']) fmw_inst_fmw_extract 'mft' do action :extract source_file node['fmw_inst']['mft_source_file'] diff --git a/fmw_inst/recipes/service_bus.rb b/fmw_inst/recipes/service_bus.rb index 143a9ad..48a81b2 100644 --- a/fmw_inst/recipes/service_bus.rb +++ b/fmw_inst/recipes/service_bus.rb @@ -10,7 +10,7 @@ fail 'fmw_inst attributes cannot be empty' unless node.attribute?('fmw_inst') -if ['12.2.1', '12.2.1.1', '12.1.3'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3'].include?(node['fmw']['version']) fmw_template = 'fmw_12c.rsp' fmw_oracle_home = node['fmw']['middleware_home_dir'] + '/osb/bin' install_type = 'Service Bus' @@ -22,6 +22,8 @@ fmw_installer_file = node['fmw']['tmp_dir'] + '/service_bus/fmw_12.2.1.0.0_osb.jar' elsif node['fmw']['version'] == '12.2.1.1' fmw_installer_file = node['fmw']['tmp_dir'] + '/service_bus/fmw_12.2.1.1.0_osb.jar' + elsif node['fmw']['version'] == '12.2.1.2' + fmw_installer_file = node['fmw']['tmp_dir'] + '/service_bus/fmw_12.2.1.2.0_osb.jar' end elsif ['10.3.6'].include?(node['fmw']['version']) @@ -60,7 +62,7 @@ # chef version 11 if VERSION.start_with? '11.' - if ['10.3.6', '12.1.3', '12.2.1', '12.2.1.1'].include?(node['fmw']['version']) + if ['10.3.6', '12.1.3', '12.2.1', '12.2.1.1', '12.2.1.2'].include?(node['fmw']['version']) ruby_block "loading for chef 11 install service_bus extract" do block do if node['os'].include?('windows') @@ -100,7 +102,7 @@ end end else - if ['10.3.6', '12.1.3', '12.2.1', '12.2.1.1'].include?(node['fmw']['version']) + if ['10.3.6', '12.1.3', '12.2.1', '12.2.1.1', '12.2.1.2'].include?(node['fmw']['version']) fmw_inst_fmw_extract 'service_bus' do action :extract source_file node['fmw_inst']['service_bus_source_file'] diff --git a/fmw_inst/recipes/soa_suite.rb b/fmw_inst/recipes/soa_suite.rb index 5f6640d..2212623 100644 --- a/fmw_inst/recipes/soa_suite.rb +++ b/fmw_inst/recipes/soa_suite.rb @@ -10,7 +10,7 @@ fail 'fmw_inst attributes cannot be empty' unless node.attribute?('fmw_inst') -if ['12.2.1', '12.2.1.1', '12.1.3'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3'].include?(node['fmw']['version']) fmw_template = 'fmw_12c.rsp' fmw_oracle_home = node['fmw']['middleware_home_dir'] + '/soa/bin' option_array = [] @@ -34,6 +34,8 @@ fmw_installer_file = node['fmw']['tmp_dir'] + '/soa_suite/fmw_12.2.1.0.0_soa.jar' elsif node['fmw']['version'] == '12.2.1.1' fmw_installer_file = node['fmw']['tmp_dir'] + '/soa_suite/fmw_12.2.1.1.0_soa.jar' + elsif node['fmw']['version'] == '12.2.1.2' + fmw_installer_file = node['fmw']['tmp_dir'] + '/soa_suite/fmw_12.2.1.2.0_soa.jar' end elsif ['10.3.6'].include?(node['fmw']['version']) @@ -69,7 +71,7 @@ # chef version 11 if VERSION.start_with? '11.' - if ['10.3.6', '12.1.3', '12.2.1', '12.2.1.1'].include?(node['fmw']['version']) + if ['10.3.6', '12.1.3', '12.2.1', '12.2.1.1', '12.2.1.2'].include?(node['fmw']['version']) ruby_block "loading for chef 11 install soa_suite extract" do block do if node['os'].include?('windows') @@ -110,7 +112,7 @@ end end else - if ['10.3.6', '12.1.3', '12.2.1', '12.2.1.1'].include?(node['fmw']['version']) + if ['10.3.6', '12.1.3', '12.2.1', '12.2.1.1', '12.2.1.2'].include?(node['fmw']['version']) fmw_inst_fmw_extract 'soa_suite' do action :extract source_file node['fmw_inst']['soa_suite_source_file'] diff --git a/fmw_inst/recipes/webcenter.rb b/fmw_inst/recipes/webcenter.rb index 08c1a98..bd3bb59 100644 --- a/fmw_inst/recipes/webcenter.rb +++ b/fmw_inst/recipes/webcenter.rb @@ -18,7 +18,7 @@ node.override['fmw']['install_type']='typical' end -if ['12.2.1', '12.2.1.1'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2'].include?(node['fmw']['version']) fmw_template = 'fmw_12c.rsp' fmw_oracle_home = node['fmw']['middleware_home_dir'] + '/wcportal' option_array = [] @@ -28,6 +28,8 @@ fmw_installer_file = node['fmw']['tmp_dir'] + '/webcenter/fmw_12.2.1.0.0_wcportal_generic.jar' elsif node['fmw']['version'] == '12.2.1.1' fmw_installer_file = node['fmw']['tmp_dir'] + '/webcenter/fmw_12.2.1.1.0_wcportal.jar' + elsif node['fmw']['version'] == '12.2.1.2' + fmw_installer_file = node['fmw']['tmp_dir'] + '/webcenter/fmw_12.2.1.2.0_wcportal.jar' end elsif ['10.3.6'].include?(node['fmw']['version']) diff --git a/fmw_opatch/recipes/service_bus.rb b/fmw_opatch/recipes/service_bus.rb index a995c51..a728116 100644 --- a/fmw_opatch/recipes/service_bus.rb +++ b/fmw_opatch/recipes/service_bus.rb @@ -13,7 +13,7 @@ fail 'source_file parameter cannot be empty' unless node['fmw_opatch'].attribute?('service_bus_source_file') fail 'patch_id parameter cannot be empty' unless node['fmw_opatch'].attribute?('service_bus_patch_id') -if ['12.2.1', '12.2.1.1', '12.1.3'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3'].include?(node['fmw']['version']) fmw_oracle_home = node['fmw']['middleware_home_dir'] elsif ['10.3.6'].include?(node['fmw']['version']) if node['os'].include?('windows') diff --git a/fmw_opatch/recipes/soa_suite.rb b/fmw_opatch/recipes/soa_suite.rb index ba83ffc..55ad822 100644 --- a/fmw_opatch/recipes/soa_suite.rb +++ b/fmw_opatch/recipes/soa_suite.rb @@ -13,7 +13,7 @@ fail 'source_file parameter cannot be empty' unless node['fmw_opatch'].attribute?('soa_suite_source_file') fail 'patch_id parameter cannot be empty' unless node['fmw_opatch'].attribute?('soa_suite_patch_id') -if ['12.2.1', '12.2.1.1', '12.1.3'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3'].include?(node['fmw']['version']) fmw_oracle_home = node['fmw']['middleware_home_dir'] elsif ['10.3.6'].include?(node['fmw']['version']) if node['os'].include?('windows') diff --git a/fmw_rcu/recipes/common.rb b/fmw_rcu/recipes/common.rb index 45171a6..dbd8279 100644 --- a/fmw_rcu/recipes/common.rb +++ b/fmw_rcu/recipes/common.rb @@ -20,12 +20,12 @@ include_recipe 'fmw_wls::install' -if ['12.2.1', '12.2.1.1', '12.1.3'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3'].include?(node['fmw']['version']) fail 'oracle_home_dir parameter cannot be empty' unless node['fmw_rcu'].attribute?('oracle_home_dir') oracle_home_dir = node['fmw_rcu']['oracle_home_dir'] end -if ['12.2.1', '12.2.1.1'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2'].include?(node['fmw']['version']) component_array = ['MDS', 'IAU', diff --git a/fmw_rcu/recipes/soa_suite.rb b/fmw_rcu/recipes/soa_suite.rb index f79e399..ce43c2c 100644 --- a/fmw_rcu/recipes/soa_suite.rb +++ b/fmw_rcu/recipes/soa_suite.rb @@ -18,14 +18,14 @@ rcu_params = rcu_params.to_hash if rcu_params.instance_of? Chef::EncryptedDataBagItem fail 'did not find the data_bag_item' if rcu_params.length == 0 -if ['12.2.1', '12.2.1.1', '12.1.3'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3'].include?(node['fmw']['version']) include_recipe 'fmw_wls::install' fail 'oracle_home_dir parameter cannot be empty' unless node['fmw_rcu'].attribute?('oracle_home_dir') oracle_home_dir = node['fmw_rcu']['oracle_home_dir'] end -if ['12.2.1', '12.2.1.1'].include?(node['fmw']['version']) +if ['12.2.1', '12.2.1.1', '12.2.1.2'].include?(node['fmw']['version']) component_array = ['MDS', 'IAU', diff --git a/fmw_wls/README.md b/fmw_wls/README.md index ed6cc9f..9b9c428 100644 --- a/fmw_wls/README.md +++ b/fmw_wls/README.md @@ -21,7 +21,7 @@ The fmw_wls cookbook allows you to install Oracle WebLogic on a Windows, Linux o ## Cookbook description -This cookbook allows you to install any WebLogic 11g (10.3.6, 12.1.1) or 12c (12.1.2, 12.1.3, 12.2.1, 12.2.1.1 ) version on any Windows, Linux or Solaris host or VM. +This cookbook allows you to install any WebLogic 11g (10.3.6, 12.1.1) or 12c (12.1.2, 12.1.3, 12.2.1, 12.2.1.1, 12.2.1.2 ) version on any Windows, Linux or Solaris host or VM. ## Setup @@ -33,7 +33,7 @@ Add this cookbook to your chef cookbook folder, add fmw_wls recipes to the run l Cookbook defaults - default['fmw']['version'] = '12.1.3' # 10.3.6|12.1.1|12.1.2|12.1.3|12.2.1|12.2.1.1 + default['fmw']['version'] = '12.1.3' # 10.3.6|12.1.1|12.1.2|12.1.3|12.2.1|12.2.1.1|12.2.1.2 default['fmw_wls']['install_type'] = 'wls' # infra or wls if platform_family?('windows') diff --git a/fmw_wls/attributes/default.rb b/fmw_wls/attributes/default.rb index f19e693..457c88e 100644 --- a/fmw_wls/attributes/default.rb +++ b/fmw_wls/attributes/default.rb @@ -1,5 +1,5 @@ -default['fmw']['version'] = '12.1.3' # 10.3.6|12.1.1|12.1.2|12.1.3|12.2.1|12.2.1.1 +default['fmw']['version'] = '12.1.3' # 10.3.6|12.1.1|12.1.2|12.1.3|12.2.1|12.2.1.1|12.2.1.2 default['fmw_wls']['install_type'] = 'wls' # infra or wls if platform_family?('windows') diff --git a/fmw_wls/definitions/wls_install.rb b/fmw_wls/definitions/wls_install.rb index c4b4103..e728e29 100644 --- a/fmw_wls/definitions/wls_install.rb +++ b/fmw_wls/definitions/wls_install.rb @@ -22,7 +22,7 @@ group params[:os_group] cwd params[:tmp_dir] end - elsif ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(params[:version]) + elsif ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(params[:version]) execute 'Install WLS' do command "#{params[:java_home_dir]}/bin/java #{java_params} -Xmx1024m -Djava.io.tmpdir=#{params[:tmp_dir]} -jar #{params[:source_file]} -silent -responseFile #{params[:tmp_dir]}/#{params[:template]} -invPtrLoc #{params[:orainst_dir]}/oraInst.loc" user params[:os_user] @@ -37,7 +37,7 @@ environment('JAVA_VENDOR' => 'Sun', 'JAVA_HOME' => params[:java_home_dir]) end - elsif ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(params[:version]) + elsif ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(params[:version]) execute 'Install WLS' do command "#{params[:java_home_dir]}\\bin\\java.exe -Xmx1024m -Djava.io.tmpdir=#{params[:tmp_dir]} -jar #{params[:source_file]} -silent -responseFile #{params[:tmp_dir]}/#{params[:template]} -logLevel fine" end diff --git a/fmw_wls/providers/wls_linux.rb b/fmw_wls/providers/wls_linux.rb index 8c91334..7f2a8a7 100644 --- a/fmw_wls/providers/wls_linux.rb +++ b/fmw_wls/providers/wls_linux.rb @@ -80,7 +80,7 @@ def load_current_resource action :create end - if ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(version) + if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(version) template = 'wls_12c.rsp' elsif ['10.3.6', '12.1.1'].include?(version) template = 'wls_11g.rsp' diff --git a/fmw_wls/providers/wls_solaris.rb b/fmw_wls/providers/wls_solaris.rb index 2a2167d..ac2f0ca 100644 --- a/fmw_wls/providers/wls_solaris.rb +++ b/fmw_wls/providers/wls_solaris.rb @@ -86,7 +86,7 @@ def load_current_resource action :create end - if ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(version) + if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(version) template = 'wls_12c.rsp' elsif ['10.3.6', '12.1.1'].include?(version) template = 'wls_11g.rsp' diff --git a/fmw_wls/providers/wls_windows.rb b/fmw_wls/providers/wls_windows.rb index 3642734..f843cc4 100644 --- a/fmw_wls/providers/wls_windows.rb +++ b/fmw_wls/providers/wls_windows.rb @@ -54,7 +54,7 @@ def load_current_resource action :create_if_missing end - if ['12.2.1', '12.2.1.1', '12.1.3', '12.1.2'].include?(version) + if ['12.2.1', '12.2.1.1', '12.2.1.2', '12.1.3', '12.1.2'].include?(version) template = 'wls_12c.rsp' elsif ['10.3.6', '12.1.1'].include?(version) template = 'wls_11g.rsp' From e393f697409ecb6bf60f5bc0ecff064eca3ec0d9 Mon Sep 17 00:00:00 2001 From: Edwin Biemond Date: Wed, 7 Dec 2016 23:52:26 +0100 Subject: [PATCH 4/4] Added 12c tests --- fmw_domain/.kitchen.yml | 60 ++++++++-- .../wls1221/serverspec/install_spec.rb | 4 +- .../wls1221_jrf/serverspec/default_spec.rb | 12 ++ .../wls1221_jrf/serverspec/install_spec.rb | 107 ++++++++++++++++++ .../wls1221_jrf/serverspec/spec_helper.rb | 3 + fmw_inst/.kitchen.yml | 62 +++++++--- .../wls1221/serverspec/default_spec.rb | 12 ++ .../wls1221/serverspec/install_spec.rb | 105 +++++++++++++++++ .../wls1221/serverspec/spec_helper.rb | 3 + fmw_jdk/.kitchen.yml | 37 +++--- .../tar/serverspec/install_spec.rb | 4 +- fmw_wls/.kitchen.yml | 25 ++-- .../wls1221/serverspec/install_spec.rb | 4 +- 13 files changed, 373 insertions(+), 65 deletions(-) create mode 100644 fmw_domain/test/integration/wls1221_jrf/serverspec/default_spec.rb create mode 100644 fmw_domain/test/integration/wls1221_jrf/serverspec/install_spec.rb create mode 100644 fmw_domain/test/integration/wls1221_jrf/serverspec/spec_helper.rb create mode 100644 fmw_inst/test/integration/wls1221/serverspec/default_spec.rb create mode 100644 fmw_inst/test/integration/wls1221/serverspec/install_spec.rb create mode 100644 fmw_inst/test/integration/wls1221/serverspec/spec_helper.rb diff --git a/fmw_domain/.kitchen.yml b/fmw_domain/.kitchen.yml index 99639a6..ea7f311 100644 --- a/fmw_domain/.kitchen.yml +++ b/fmw_domain/.kitchen.yml @@ -1,6 +1,7 @@ --- driver: name: vagrant + provider: vmware_fusion provisioner: name: chef_solo @@ -12,7 +13,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] network: - ["private_network", {ip: "10.10.10.135"}] - name: oel-7.0 @@ -22,7 +23,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] network: - ["private_network", {ip: "10.10.10.135"}] - name: oel-6.6 @@ -32,7 +33,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] network: - ["private_network", {ip: "10.10.10.135"}] - name: oel-5.8 @@ -42,7 +43,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] network: - ["private_network", {ip: "10.10.10.135"}] - name: windows-2012r2 @@ -54,7 +55,7 @@ platforms: memory: 3072 cpus: 2 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] network: - ["private_network", {ip: "10.10.10.135"}] - name: windows-8.1 @@ -66,7 +67,7 @@ platforms: memory: 3072 cpus: 2 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] network: - ["private_network", {ip: "10.10.10.135"}] - name: solaris-10 @@ -76,7 +77,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] network: - ["private_network", {ip: "10.10.10.135"}] - name: solaris-11.2 @@ -86,7 +87,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] network: - ["private_network", {ip: "10.10.10.135"}] @@ -103,14 +104,14 @@ suites: - recipe[fmw_domain::adminserver] attributes: fmw: - java_home_dir: "/usr/java/jdk1.8.0_40" + java_home_dir: "/usr/java/jdk1.8.0_111" middleware_home_dir: "/opt/oracle/middleware_1221" weblogic_home_dir: "/opt/oracle/middleware_1221/wlserver" - version: "12.2.1.1" + version: "12.2.1.2" fmw_jdk: - source_file: "/software/jdk-8u40-linux-x64.tar.gz" + source_file: "/software/jdk-8u111-linux-x64.tar.gz" fmw_wls: - source_file: "/software/fmw_12.2.1.1.0_wls.jar" + source_file: "/software/fmw_12.2.1.2.0_wls.jar" fmw_domain: databag_key: "DEV_WLS1" domains_dir: "/opt/oracle/middleware_1221/user_projects/domains" @@ -120,6 +121,41 @@ suites: - windows-8.1 - solaris-11.2 - solaris-10 + + - name: wls1221_jrf + data_bags_path: "test/integration/data_bags" + run_list: + - recipe[fmw_jdk::install] + - recipe[fmw_jdk::rng_service] + - recipe[fmw_wls::setup] + - recipe[fmw_wls::install] + - recipe[fmw_domain::domain] + - recipe[fmw_domain::extension_jrf] + - recipe[fmw_domain::nodemanager] + - recipe[fmw_domain::adminserver] + attributes: + fmw: + java_home_dir: "/usr/java/jdk1.8.0_111" + middleware_home_dir: "/opt/oracle/middleware_1221" + weblogic_home_dir: "/opt/oracle/middleware_1221/wlserver" + version: "12.2.1.2" + fmw_jdk: + source_file: "/software/jdk-8u111-linux-x64.tar.gz" + fmw_wls: + source_file: "/software/fmw_12.2.1.2.0_infrastructure.jar" + install_type: "infra" + fmw_domain: + databag_key: "DEV_WLS1" + restricted: true + domains_dir: "/opt/oracle/middleware_1221/user_projects/domains" + apps_dir: "/opt/oracle/middleware_1221/user_projects/applications" + nodemanager_listen_address: "10.10.10.135" + excludes: + - windows-2012r2 + - windows-8.1 + - solaris-11.2 + - solaris-10 + - name: wls1213 data_bags_path: "test/integration/data_bags" run_list: diff --git a/fmw_domain/test/integration/wls1221/serverspec/install_spec.rb b/fmw_domain/test/integration/wls1221/serverspec/install_spec.rb index ab9836c..03cdd6c 100644 --- a/fmw_domain/test/integration/wls1221/serverspec/install_spec.rb +++ b/fmw_domain/test/integration/wls1221/serverspec/install_spec.rb @@ -5,12 +5,12 @@ # Serverspec examples can be found at # http://serverspec.org/resource_types.html - describe file('/usr/java/jdk1.8.0_40') do + describe file('/usr/java/jdk1.8.0_111') do it { should be_directory } it { should be_owned_by 'root' } end - describe file('/usr/java/jdk1.8.0_40/bin/java') do + describe file('/usr/java/jdk1.8.0_111/bin/java') do it { should be_file } it { should be_owned_by 'root' } it { should be_executable } diff --git a/fmw_domain/test/integration/wls1221_jrf/serverspec/default_spec.rb b/fmw_domain/test/integration/wls1221_jrf/serverspec/default_spec.rb new file mode 100644 index 0000000..dd2b296 --- /dev/null +++ b/fmw_domain/test/integration/wls1221_jrf/serverspec/default_spec.rb @@ -0,0 +1,12 @@ +require 'spec_helper' + +describe 'fmw_wls::default' do + + # Serverspec examples can be found at + # http://serverspec.org/resource_types.html + + # it 'does something' do + # skip 'Replace this with meaningful tests' + # end + +end \ No newline at end of file diff --git a/fmw_domain/test/integration/wls1221_jrf/serverspec/install_spec.rb b/fmw_domain/test/integration/wls1221_jrf/serverspec/install_spec.rb new file mode 100644 index 0000000..4ebf56d --- /dev/null +++ b/fmw_domain/test/integration/wls1221_jrf/serverspec/install_spec.rb @@ -0,0 +1,107 @@ +require 'spec_helper' + +describe 'fmw_domain::domain' do + + # Serverspec examples can be found at + # http://serverspec.org/resource_types.html + + describe file('/usr/java/jdk1.8.0_111') do + it { should be_directory } + it { should be_owned_by 'root' } + end + + describe file('/usr/java/jdk1.8.0_111/bin/java') do + it { should be_file } + it { should be_owned_by 'root' } + it { should be_executable } + end + + describe file('/usr/bin/java') do + it { should be_symlink } + it { should be_linked_to '/etc/alternatives/java' } + end + + if ['redhat'].include?(os[:family]) and os[:release] >= '6.0' + + describe service('rngd') do + it { should be_enabled } + it { should be_running } + end + + elsif ['debian'].include?(os[:family]) + + describe service('rng-tools') do + it { should be_enabled } + end + + describe service('rngd') do + it { should be_running } + end + + end + + describe group('oinstall') do + it { should exist } + end + + describe user('oracle') do + it { should belong_to_group 'oinstall' } + it { should have_home_directory '/home/oracle' } + it { should have_login_shell '/bin/bash' } + end + + describe file('/etc/oraInst.loc') do + it { should be_file } + it { should be_owned_by 'root' } + it { should be_readable.by('others') } + it { should contain 'inventory_loc=/home/oracle/oraInventory' } + it { should contain 'inst_group=oinstall' } + end + + describe file('/tmp/wls_12c.rsp') do + it { should be_file } + it { should contain 'ORACLE_HOME=/opt/oracle/middleware_1221' } + it { should contain 'INSTALL_TYPE=Fusion Middleware Infrastructure' } + end + + describe file('/home/oracle/oraInventory') do + it { should be_directory } + it { should be_owned_by 'oracle' } + it { should be_grouped_into 'oinstall' } + end + + describe file('/opt/oracle/middleware_1221') do + it { should be_directory } + it { should be_owned_by 'oracle' } + it { should be_grouped_into 'oinstall' } + end + + describe file('/opt/oracle/middleware_1221/oracle_common/common/bin/wlst.sh') do + it { should be_file } + it { should be_owned_by 'oracle' } + it { should be_grouped_into 'oinstall' } + it { should be_executable } + end + + describe file('/opt/oracle/middleware_1221/user_projects/domains/base') do + it { should be_directory } + it { should be_owned_by 'oracle' } + it { should be_grouped_into 'oinstall' } + end + + unless ['redhat'].include?(os[:family]) and os[:release] < '6.0' + describe service('nodemanager_base') do + it { should be_enabled } + it { should be_running } + end + end + + describe port(5556) do + it { should be_listening } + end + + describe port(7001) do + it { should be_listening } + end + +end \ No newline at end of file diff --git a/fmw_domain/test/integration/wls1221_jrf/serverspec/spec_helper.rb b/fmw_domain/test/integration/wls1221_jrf/serverspec/spec_helper.rb new file mode 100644 index 0000000..37af1b4 --- /dev/null +++ b/fmw_domain/test/integration/wls1221_jrf/serverspec/spec_helper.rb @@ -0,0 +1,3 @@ +require 'serverspec' + +set :backend, :exec diff --git a/fmw_inst/.kitchen.yml b/fmw_inst/.kitchen.yml index 5ca4649..4b85321 100644 --- a/fmw_inst/.kitchen.yml +++ b/fmw_inst/.kitchen.yml @@ -1,15 +1,16 @@ --- driver: name: vagrant - http_proxy: http://www-proxy.us.oracle.com:80 - https_proxy: http://www-proxy.us.oracle.com:80 - provision_command: "env http_proxy=http://www-proxy.us.oracle.com:80 bash -c 'curl -L http://www.getchef.com/chef/install.sh | bash'" - vagrantfiles: - - Vagrantfile.rb + provider: vmware_fusion + # http_proxy: http://www-proxy.us.oracle.com:80 + # https_proxy: http://www-proxy.us.oracle.com:80 + # provision_command: "env http_proxy=http://www-proxy.us.oracle.com:80 bash -c 'curl -L http://www.getchef.com/chef/install.sh | bash'" + # vagrantfiles: + # - Vagrantfile.rb provisioner: name: chef_solo - chef_omnibus_url: http://www.getchef.com/chef/install.sh + # chef_omnibus_url: http://www.getchef.com/chef/install.sh platforms: - name: debian-7.2.0 @@ -20,18 +21,17 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["<%= ENV['ARTIFACT_DIRECTORY'] %>", "/software"] - - name: oel-7.1 + - ["/Users/edwinbiemond/software", "/software"] + - name: oel-7.0 driver_config: - box: OEL-7.1-x86_64 - box_url: file:///software/OEL7_1-x86_64.box + box: OEL-7.2-x86_64 ssh_timeout: 45 ssh_retries: 10 customize: memory: 2048 cpus: 1 synced_folders: - - ["<%= ENV['ARTIFACT_DIRECTORY'] %>", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: oel-6.6 driver_config: box: OEL-6.6 @@ -41,7 +41,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["<%= ENV['ARTIFACT_DIRECTORY'] %>", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: oel-5.8 driver_config: box: OEL-5.8 @@ -51,7 +51,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["<%= ENV['ARTIFACT_DIRECTORY'] %>", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: windows-2012r2 transport: name: winrm @@ -63,7 +63,7 @@ platforms: memory: 4096 cpus: 2 synced_folders: - - ["<%= ENV['ARTIFACT_DIRECTORY'] %>", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: windows-8.1 transport: name: winrm @@ -75,7 +75,7 @@ platforms: memory: 4096 cpus: 2 synced_folders: - - ["<%= ENV['ARTIFACT_DIRECTORY'] %>", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: solaris-10 driver_config: box: solaris10-x86_64 @@ -85,7 +85,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["<%= ENV['ARTIFACT_DIRECTORY'] %>", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: solaris-11.2 driver_config: box: solaris11_2-x86_64 @@ -95,9 +95,37 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["<%= ENV['ARTIFACT_DIRECTORY'] %>", "/software"] + - ["/Users/edwinbiemond/software", "/software"] suites: + - name: wls1221 + run_list: + - recipe[fmw_jdk::install] + - recipe[fmw_jdk::rng_service] + - recipe[fmw_wls::setup] + - recipe[fmw_wls::install] + - recipe[fmw_inst::soa_suite] + - recipe[fmw_inst::service_bus] + attributes: + fmw: + java_home_dir: "/usr/java/jdk1.8.0_111" + middleware_home_dir: "/opt/oracle/middleware_1221" + version: "12.2.1.2" + fmw_jdk: + source_file: "/software/jdk-8u111-linux-x64.tar.gz" + fmw_wls: + source_file: "/software/fmw_12.2.1.2.0_infrastructure.jar" + install_type: "infra" + fmw_inst: + soa_suite_source_file: "/software/fmw_12.2.1.2.0_soa_Disk1_1of1.zip" + soa_suite_install_type: "BPM" + service_bus_source_file: "/software/fmw_12.2.1.2.0_osb_Disk1_1of1.zip" + excludes: + - windows-2012r2 + - windows-8.1 + - solaris-11.2 + - solaris-10 + - name: wls1213 run_list: - recipe[fmw_jdk::install] diff --git a/fmw_inst/test/integration/wls1221/serverspec/default_spec.rb b/fmw_inst/test/integration/wls1221/serverspec/default_spec.rb new file mode 100644 index 0000000..9c2ab30 --- /dev/null +++ b/fmw_inst/test/integration/wls1221/serverspec/default_spec.rb @@ -0,0 +1,12 @@ +require 'spec_helper' + +describe 'fmw_inst::default' do + + # Serverspec examples can be found at + # http://serverspec.org/resource_types.html + + # it 'does something' do + # skip 'Replace this with meaningful tests' + # end + +end \ No newline at end of file diff --git a/fmw_inst/test/integration/wls1221/serverspec/install_spec.rb b/fmw_inst/test/integration/wls1221/serverspec/install_spec.rb new file mode 100644 index 0000000..59da549 --- /dev/null +++ b/fmw_inst/test/integration/wls1221/serverspec/install_spec.rb @@ -0,0 +1,105 @@ +require 'spec_helper' + +describe 'fmw_inst::install' do + + # Serverspec examples can be found at + # http://serverspec.org/resource_types.html + + describe file('/usr/java/jdk1.8.0_111') do + it { should be_directory } + it { should be_owned_by 'root' } + end + + describe file('/usr/java/jdk1.8.0_111/bin/java') do + it { should be_file } + it { should be_owned_by 'root' } + it { should be_executable } + end + + describe file('/usr/bin/java') do + it { should be_symlink } + it { should be_linked_to '/etc/alternatives/java' } + end + + if ['redhat'].include?(os[:family]) and os[:release] >= '6.0' + + describe service('rngd') do + it { should be_enabled } + it { should be_running } + end + + elsif ['debian'].include?(os[:family]) + + describe service('rng-tools') do + it { should be_enabled } + end + + describe service('rngd') do + it { should be_running } + end + + end + + describe group('oinstall') do + it { should exist } + end + + describe user('oracle') do + it { should belong_to_group 'oinstall' } + it { should have_home_directory '/home/oracle' } + it { should have_login_shell '/bin/bash' } + end + + describe file('/etc/oraInst.loc') do + it { should be_file } + it { should be_owned_by 'root' } + it { should be_readable.by('others') } + it { should contain 'inventory_loc=/home/oracle/oraInventory' } + it { should contain 'inst_group=oinstall' } + end + + describe file('/tmp/wls_12c.rsp') do + it { should be_file } + it { should contain 'ORACLE_HOME=/opt/oracle/middleware_1221' } + it { should contain 'INSTALL_TYPE=Fusion Middleware Infrastructure' } + end + + describe file('/home/oracle/oraInventory') do + it { should be_directory } + it { should be_owned_by 'oracle' } + it { should be_grouped_into 'oinstall' } + end + + describe file('/opt/oracle/middleware_1221') do + it { should be_directory } + it { should be_owned_by 'oracle' } + it { should be_grouped_into 'oinstall' } + end + + describe file('/opt/oracle/middleware_1221/oracle_common/common/bin/wlst.sh') do + it { should be_file } + it { should be_owned_by 'oracle' } + it { should be_grouped_into 'oinstall' } + it { should be_executable } + end + + describe file('/opt/oracle/middleware_1221/oracle_common/bin/rcu') do + it { should be_file } + it { should be_owned_by 'oracle' } + it { should be_grouped_into 'oinstall' } + it { should be_executable } + end + + describe file('/opt/oracle/middleware_1221/soa/bin') do + it { should be_directory } + it { should be_owned_by 'oracle' } + it { should be_grouped_into 'oinstall' } + end + + describe file('/opt/oracle/middleware_1221/osb/bin') do + it { should be_directory } + it { should be_owned_by 'oracle' } + it { should be_grouped_into 'oinstall' } + end + +end diff --git a/fmw_inst/test/integration/wls1221/serverspec/spec_helper.rb b/fmw_inst/test/integration/wls1221/serverspec/spec_helper.rb new file mode 100644 index 0000000..37af1b4 --- /dev/null +++ b/fmw_inst/test/integration/wls1221/serverspec/spec_helper.rb @@ -0,0 +1,3 @@ +require 'serverspec' + +set :backend, :exec diff --git a/fmw_jdk/.kitchen.yml b/fmw_jdk/.kitchen.yml index 73cb5cb..a6b633f 100644 --- a/fmw_jdk/.kitchen.yml +++ b/fmw_jdk/.kitchen.yml @@ -1,6 +1,7 @@ --- driver: name: vagrant + provider: vmware_fusion provisioner: name: chef_solo @@ -12,7 +13,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: oel-7.0 driver_config: box: OEL-7.2-x86_64 @@ -20,7 +21,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: oel-6.6 driver_config: box: OEL6_6-x86_64 @@ -28,7 +29,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: oel-5.8 driver_config: box: OEL-5.8 @@ -36,7 +37,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: solaris-10 driver_config: box: solaris10-x86_64 @@ -44,7 +45,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: solaris-11.2 driver_config: box: solaris11_2-x86_64 @@ -52,7 +53,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: windows-2012r2 transport: name: winrm @@ -62,7 +63,7 @@ platforms: memory: 3072 cpus: 2 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: windows-8.1 transport: name: winrm @@ -72,7 +73,7 @@ platforms: memory: 3072 cpus: 2 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] suites: - name: exe @@ -80,9 +81,9 @@ suites: - recipe[fmw_jdk::install] attributes: fmw: - java_home_dir: "C:/java/jdk1.8.0_40" + java_home_dir: "C:/java/jdk1.8.0_111" fmw_jdk: - source_file: "C:/software/jdk-8u40-windows-x64.exe" + source_file: "/Users/edwinbiemond/software/jdk-8u111-windows-x64.exe" excludes: - debian-7.2.0 - oel-7.0 @@ -96,9 +97,9 @@ suites: - recipe[fmw_jdk::rng_service] attributes: fmw: - java_home_dir: "/usr/java/jdk1.8.0_40" + java_home_dir: "/usr/java/jdk1.8.0_111" fmw_jdk: - source_file: "/software/jdk-8u40-linux-x64.rpm" + source_file: "/software/jdk-8u111-linux-x64.rpm" excludes: - debian-7.2.0 - windows-2012r2 @@ -111,9 +112,9 @@ suites: - recipe[fmw_jdk::rng_service] attributes: fmw: - java_home_dir: "/usr/java/jdk1.7.0_75" + java_home_dir: "/usr/java/jdk1.7.0_79" fmw_jdk: - source_file: "/software/jdk-7u75-linux-x64.rpm" + source_file: "/software/jdk-7u79-linux-x64.rpm" excludes: - debian-7.2.0 - windows-2012r2 @@ -126,9 +127,9 @@ suites: - recipe[fmw_jdk::rng_service] attributes: fmw: - java_home_dir: "/usr/java/jdk1.8.0_40" + java_home_dir: "/usr/java/jdk1.8.0_111" fmw_jdk: - source_file: "/software/jdk-8u40-linux-x64.tar.gz" + source_file: "/software/jdk-8u111-linux-x64.tar.gz" excludes: - windows-2012r2 - windows-8.1 @@ -140,9 +141,9 @@ suites: - recipe[fmw_jdk::rng_service] attributes: fmw: - java_home_dir: "/usr/java/jdk1.7.0_75" + java_home_dir: "/usr/java/jdk1.7.0_79" fmw_jdk: - source_file: "/software/jdk-7u75-linux-x64.tar.gz" + source_file: "/software/jdk-7u79-linux-x64.tar.gz" excludes: - windows-2012r2 - windows-8.1 diff --git a/fmw_jdk/test/integration/tar/serverspec/install_spec.rb b/fmw_jdk/test/integration/tar/serverspec/install_spec.rb index 64516d7..1040750 100644 --- a/fmw_jdk/test/integration/tar/serverspec/install_spec.rb +++ b/fmw_jdk/test/integration/tar/serverspec/install_spec.rb @@ -5,12 +5,12 @@ # Serverspec examples can be found at # http://serverspec.org/resource_types.html - describe file('/usr/java/jdk1.8.0_40') do + describe file('/usr/java/jdk1.8.0_111') do it { should be_directory } it { should be_owned_by 'root' } end - describe file('/usr/java/jdk1.8.0_40/bin/java') do + describe file('/usr/java/jdk1.8.0_111/bin/java') do it { should be_file } it { should be_owned_by 'root' } it { should be_executable } diff --git a/fmw_wls/.kitchen.yml b/fmw_wls/.kitchen.yml index 08c3c3a..43ceb8d 100644 --- a/fmw_wls/.kitchen.yml +++ b/fmw_wls/.kitchen.yml @@ -1,6 +1,7 @@ --- driver: name: vagrant + provider: vmware_fusion provisioner: name: chef_solo @@ -12,7 +13,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: oel-7.0 driver_config: box: OEL-7.2-x86_64 @@ -20,7 +21,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: oel-6.6 driver_config: box: OEL-6.6 @@ -28,7 +29,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: oel-5.8 driver_config: box: OEL-5.8 @@ -36,7 +37,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: windows-2012r2 transport: name: winrm @@ -46,7 +47,7 @@ platforms: memory: 4096 cpus: 2 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: windows-8.1 transport: name: winrm @@ -56,7 +57,7 @@ platforms: memory: 4096 cpus: 2 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: solaris-10 driver_config: box: solaris10-x86_64 @@ -64,7 +65,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] - name: solaris-11.2 driver_config: box: solaris11_2-x86_64 @@ -72,7 +73,7 @@ platforms: memory: 2048 cpus: 1 synced_folders: - - ["C:/software", "/software"] + - ["/Users/edwinbiemond/software", "/software"] suites: @@ -84,13 +85,13 @@ suites: - recipe[fmw_wls::install] attributes: fmw: - java_home_dir: "/usr/java/jdk1.8.0_40" + java_home_dir: "/usr/java/jdk1.8.0_111" middleware_home_dir: "/opt/oracle/middleware_1221" - version: "12.2.1.1" + version: "12.2.1.2" fmw_jdk: - source_file: "/software/jdk-8u40-linux-x64.tar.gz" + source_file: "/software/jdk-8u111-linux-x64.tar.gz" fmw_wls: - source_file: "/software/fmw_12.2.1.1.0_wls.jar" + source_file: "/software/fmw_12.2.1.2.0_wls.jar" excludes: - windows-2012r2 - windows-8.1 diff --git a/fmw_wls/test/integration/wls1221/serverspec/install_spec.rb b/fmw_wls/test/integration/wls1221/serverspec/install_spec.rb index d6852d6..717a819 100644 --- a/fmw_wls/test/integration/wls1221/serverspec/install_spec.rb +++ b/fmw_wls/test/integration/wls1221/serverspec/install_spec.rb @@ -5,12 +5,12 @@ # Serverspec examples can be found at # http://serverspec.org/resource_types.html - describe file('/usr/java/jdk1.8.0_40') do + describe file('/usr/java/jdk1.8.0_111') do it { should be_directory } it { should be_owned_by 'root' } end - describe file('/usr/java/jdk1.8.0_40/bin/java') do + describe file('/usr/java/jdk1.8.0_111/bin/java') do it { should be_file } it { should be_owned_by 'root' } it { should be_executable }