Merge pull request #187 from Alfresco/develop

Support for 5.2
AlfrescoLabs · Feb 7, 2017 · 4a5d671 · 4a5d671
2 parents 3b477d7 + 1b521fb
commit 4a5d671
Show file tree

Hide file tree

Showing 50 changed files with 1,304 additions and 217 deletions.
diff --git a/.kitchen.docker.yml b/.kitchen.docker.yml
@@ -47,12 +47,37 @@ suites:
       "nginx" : {
         "use_nossl_config" : true
       }
-    }
+     }
+  - name: community-52
+    run_list:
+      - recipe[alfresco::default]
+      - recipe[alfresco::redeploy]
+    verifier:
+      inspec_tests:
+        - name: nginx-hardening
+          git: https://github.com/Alfresco/tests-nginx-hardening
+    data_bags_path: "test/integration/data_bags"
+    attributes: {
+      "name": "chef-alfresco-community-52",
+      "hostname": "alfresco-allinone-test",
+      "alfresco" : {
+        "components" : ['haproxy','nginx','tomcat','transform','repo','share','solr','mysql','googledocs','yourkit'],
+        "version" : "5.2.d",
+        "ssl_enabled" : false
+      },
+      "nginx" : {
+        "use_nossl_config" : true
+      }
+     }
   - name: enterprise
     run_list:
       - recipe[alfresco::default]
       - recipe[alfresco::redeploy]
     data_bags_path: "test/integration/data_bags"
+    verifier:
+      inspec_tests:
+        - name: nginx-hardening
+          git: https://github.com/Alfresco/tests-nginx-hardening
     attributes: {
       "name": "chef-alfresco-enterprise",
       "hostname": "alfresco-allinone-test",
@@ -82,4 +107,48 @@ suites:
       "nginx" : {
         "use_nossl_config" : true
       }
-    }
+     }
+  - name: enterprise-52
+    run_list:
+      - recipe[alfresco::default]
+      - recipe[alfresco::redeploy]
+    data_bags_path: "test/integration/data_bags"
+    verifier:
+      inspec_tests:
+        - name: nginx-hardening
+          git: https://github.com/Alfresco/tests-nginx-hardening
+    attributes: {
+      "name": "chef-alfresco-enterprise-52",
+      "hostname": "alfresco-allinone-test",
+      "alfresco" : {
+        "version" : "5.2-EA",
+        "components" : ["haproxy","nginx","tomcat","transform","repo","share","solr","mysql","aos","rm"],
+        "edition" : "enterprise",
+        "ssl_enabled" : false
+      },
+      "artifact-deployer" : {
+        "maven" : {
+          "timeout" : 1500,
+          "repositories" : {
+            "internal" : {
+              "url" : "https://artifacts.alfresco.com/nexus/content/groups/internal",
+              "username" : "<%= ENV['NEXUS_USERNAME'] %>",
+              "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
+            },
+            "staging" : {
+              "url" : "https://artifacts.alfresco.com/nexus/content/repositories/internal-staging",
+              "username" : "<%= ENV['NEXUS_USERNAME'] %>",
+              "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
+            },
+            "internal-releases" : {
+              "url" : "https://artifacts.alfresco.com/nexus/content/repositories/internal-releases",
+              "username" : "<%= ENV['NEXUS_USERNAME'] %>",
+              "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
+            }
+          }
+        }
+      },
+      "nginx" : {
+        "use_nossl_config" : true
+      }
+     }
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -44,17 +44,42 @@ suites:
       "nginx" : {
         "use_nossl_config" : true
       }
-    }
+     }
+  - name: community-52
+    run_list:
+      - recipe[alfresco::default]
+      - recipe[alfresco::redeploy]
+    verifier:
+      inspec_tests:
+        - name: nginx-hardening
+          git: https://github.com/Alfresco/tests-nginx-hardening
+    data_bags_path: "test/integration/data_bags"
+    attributes: {
+      "name": "chef-alfresco-community-52",
+      "hostname": "alfresco-allinone-test",
+      "alfresco" : {
+        "components" : ['haproxy','nginx','tomcat','transform','repo','share','solr','mysql','googledocs','yourkit'],
+        "version" : "5.2.d",
+        "ssl_enabled" : false
+      },
+      "nginx" : {
+        "use_nossl_config" : true
+      }
+     }
   - name: enterprise
     run_list:
       - recipe[alfresco::default]
       - recipe[alfresco::redeploy]
     data_bags_path: "test/integration/data_bags"
+    verifier:
+      inspec_tests:
+        - name: nginx-hardening
+          git: https://github.com/Alfresco/tests-nginx-hardening
     attributes: {
       "name": "chef-alfresco-enterprise",
       "hostname": "alfresco-allinone-test",
       "alfresco" : {
-        "version" : "5.1.1.1",
+        "version" : "5.1.2",
         "components" : ["haproxy","nginx","tomcat","transform","repo","share","solr","mysql","aos", "rm"],
         "edition" : "enterprise",
         "ssl_enabled" : false
@@ -79,4 +104,48 @@ suites:
       "nginx" : {
         "use_nossl_config" : true
       }
-    }
+     }
+  - name: enterprise-52
+    run_list:
+      - recipe[alfresco::default]
+      - recipe[alfresco::redeploy]
+    data_bags_path: "test/integration/data_bags"
+    verifier:
+      inspec_tests:
+        - name: nginx-hardening
+          git: https://github.com/Alfresco/tests-nginx-hardening
+    attributes: {
+      "name": "chef-alfresco-enterprise-52",
+      "hostname": "alfresco-allinone-test",
+      "alfresco" : {
+        "version" : "5.2-EA",
+        "components" : ["haproxy","nginx","tomcat","transform","repo","share","solr","mysql","aos","rm"],
+        "edition" : "enterprise",
+        "ssl_enabled" : false
+      },
+      "artifact-deployer" : {
+        "maven" : {
+          "timeout" : 1500,
+          "repositories" : {
+            "internal" : {
+              "url" : "https://artifacts.alfresco.com/nexus/content/groups/internal",
+              "username" : "<%= ENV['NEXUS_USERNAME'] %>",
+              "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
+            },
+            "staging" : {
+              "url" : "https://artifacts.alfresco.com/nexus/content/repositories/internal-staging",
+              "username" : "<%= ENV['NEXUS_USERNAME'] %>",
+              "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
+            },
+            "internal-releases" : {
+              "url" : "https://artifacts.alfresco.com/nexus/content/repositories/internal-releases",
+              "username" : "<%= ENV['NEXUS_USERNAME'] %>",
+              "password" : "<%= ENV['NEXUS_PASSWORD'] %>"
+            }
+          }
+        }
+      },
+      "nginx" : {
+        "use_nossl_config" : true
+      }
+     }
diff --git a/.travis.yml b/.travis.yml
@@ -11,4 +11,4 @@ before_script: sudo iptables -L DOCKER || sudo iptables -N DOCKER
 script:
   - bundle exec rake
   # Run test-kitchen with docker driver, for example:
-  - bundle exec rake 'integration:docker[community,test]'
+  - bundle exec rake 'integration:docker[community-centos,test]'
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -5,6 +5,7 @@ DEPENDENCIES
   commons
     git: https://github.com/Alfresco/chef-commons.git
     revision: 2bf78daa6567fb27fe724e055909762641260765
+    tag: v0.5.5
   database
     git: https://github.com/enzor/database.git
     revision: 416897fdc662766025eaf2ace668a3f3c62850c3
@@ -27,7 +28,7 @@ GRAPH
   activemq (3.0.1)
     compat_resource (>= 12.16.3)
     java (~> 1.13)
-  alfresco (0.7.18)
+  alfresco (0.7.20)
     activemq (>= 1.3.3)
     alfresco-webserver (~> 0.7.4)
     artifact-deployer (>= 0.8.18)
@@ -84,15 +85,15 @@ GRAPH
   cpu (1.0.0)
   database (5.0.0)
     postgresql (>= 1.0.0)
-  dmg (3.0.0)
+  dmg (3.1.0)
   ffmpeg (0.4.4)
     build-essential (>= 0.0.0)
     git (>= 0.0.0)
     libvpx (>= 0.0.0)
     x264 (>= 0.0.0)
     yasm (>= 0.0.0)
   file (2.0.0)
-  git (5.0.1)
+  git (5.0.2)
     build-essential (>= 0.0.0)
     dmg (>= 0.0.0)
     yum-epel (>= 0.0.0)
@@ -101,7 +102,7 @@ GRAPH
     cpu (>= 0.2.0)
   homebrew (3.0.0)
   imagemagick (0.2.3)
-  java (1.45.0)
+  java (1.47.0)
     apt (>= 0.0.0)
     homebrew (>= 0.0.0)
     windows (>= 0.0.0)
@@ -115,16 +116,13 @@ GRAPH
   logstash-forwarder (0.2.4)
     apt (>= 0.0.0)
     yum (>= 0.0.0)
-  mariadb (0.3.3)
+  mariadb (1.0.1)
     apt (>= 0.0.0)
     yum (>= 0.0.0)
     yum-epel (>= 0.0.0)
   maven (1.2.0)
     ark (~> 0.4)
     java (~> 1.13)
-  mingw (1.2.5)
-    compat_resource (>= 12.16.3)
-    seven_zip (>= 0.0.0)
   mysql (7.2.0)
     smf (>= 0.0.0)
     yum-mysql-community (>= 0.0.0)
@@ -144,7 +142,7 @@ GRAPH
     nginx (>= 2.0.0)
     openssl (>= 0.0.0)
   ohai (2.1.0)
-  openssl (6.0.0)
+  openssl (6.1.1)
   packagecloud (0.2.5)
   postgresql (6.0.1)
     build-essential (>= 2.0.0)
@@ -160,8 +158,6 @@ GRAPH
   runit (1.8.0)
     packagecloud (>= 0.0.0)
     yum-epel (>= 0.0.0)
-  seven_zip (2.0.2)
-    windows (>= 1.2.2)
   smf (2.2.8)
     rbac (>= 1.0.1)
   swftools (0.2.4)

diff --git a/Rakefile b/Rakefile
@@ -9,6 +9,11 @@ task :knife do
   sh "bundle exec knife cookbook test cookbook -o ./ -a"
 end
 
+desc 'Runs ChefSpec tests'
+task :chefspec do
+  sh 'rspec'
+end
+
 desc "Runs foodcritic test"
 task :foodcritic do
   FoodCritic::Rake::LintTask.new
@@ -60,4 +65,4 @@ namespace :integration do
   end
 end
 
-task :default => [ :foodcritic, :knife, :unit ]
+task :default => [ :foodcritic, :knife, :unit, :chefspec ]
diff --git a/attributes/alfrescoproperties.rb b/attributes/alfrescoproperties.rb
@@ -65,7 +65,7 @@
 #Transformations
 default['alfresco']['properties']['ffmpeg.exe'] = '/usr/bin/ffmpeg'
 default['alfresco']['properties']['ooo.enabled'] = false
-default['alfresco']['properties']['jodconverter.officeHome'] = '/opt/libreoffice4.4/'
+default['alfresco']['properties']['jodconverter.officeHome'] = '/opt/libreoffice5.2/'
 default['alfresco']['properties']['jodconverter.portNumbers'] = '8101'
 default['alfresco']['properties']['jodconverter.enabled'] = true
 default['alfresco']['properties']['jodconverter.connectTimeout'] = 50000

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -42,7 +42,7 @@
 
 # Alfresco version; you can use Enterprise versions, ie. '5.0.1'
 default['alfresco']['groupId'] = "org.alfresco"
-default['alfresco']['version'] = "5.1.g"
+default['alfresco']['version'] = "5.2.d"
 default['alfresco']['edition'] = "community"
 
 default['alfresco']['home'] = "/usr/share/tomcat"
@@ -93,10 +93,8 @@
 default['alfresco']['imagemagick_name'] = "ImageMagick-#{node['alfresco']['imagemagick_version']}.x86_64.rpm"
 default['alfresco']['imagemagick_url'] = "ftp://ftp.icm.edu.pl/vol/rzm4/ImageMagick/linux/CentOS/x86_64/#{node['alfresco']['imagemagick_name']}"
 
-default['alfresco']['libreoffice_version'] = "4.4.5.2"
-default['alfresco']['libre_office_name'] = "LibreOffice_#{node['alfresco']['libreoffice_version']}_Linux_x86-64_rpm"
-default['alfresco']['libre_office_tar_name'] = "#{node['alfresco']['libre_office_name']}.tar.gz"
-default['alfresco']['libre_office_tar_url'] = "https://downloadarchive.documentfoundation.org/libreoffice/old/#{node['alfresco']['libreoffice_version']}/rpm/x86_64/#{node['alfresco']['libre_office_tar_name']}"
+# default libreoffice_version for Alfresco 5.2
+default['alfresco']['libreoffice_version'] = '5.2.1.2'
 
 default['alfresco']['install_fonts'] = false
 default['alfresco']['install_swftools'] = true

diff --git a/attributes/rm-attributes.rb b/attributes/rm-attributes.rb
@@ -0,0 +1,57 @@
+# rm 2.5/2.4 enterprise repo
+default['artifacts']['alfresco-rm-enterprise-repo']['groupId'] = "org.alfresco"
+default['artifacts']['alfresco-rm-enterprise-repo']['artifactId'] = "alfresco-rm-enterprise-repo"
+default['artifacts']['alfresco-rm-enterprise-repo']['type'] = "amp"
+default['artifacts']['alfresco-rm-enterprise-repo']['owner'] = node['alfresco']['user']
+default['artifacts']['alfresco-rm-enterprise-repo']['enabled'] = false
+
+# rm 2.5/2.4 enterprise share
+default['artifacts']['alfresco-rm-enterprise-share']['groupId'] = "org.alfresco"
+default['artifacts']['alfresco-rm-enterprise-share']['artifactId'] = "alfresco-rm-enterprise-share"
+default['artifacts']['alfresco-rm-enterprise-share']['type'] = "amp"
+default['artifacts']['alfresco-rm-enterprise-share']['owner'] = node['alfresco']['user']
+default['artifacts']['alfresco-rm-enterprise-share']['enabled'] = false
+
+# rm 2.5/2.4 community repo
+default['artifacts']['alfresco-rm-community-repo']['groupId'] = "org.alfresco"
+default['artifacts']['alfresco-rm-community-repo']['artifactId'] = "alfresco-rm-community-repo"
+default['artifacts']['alfresco-rm-community-repo']['type'] = "amp"
+default['artifacts']['alfresco-rm-community-repo']['owner'] = node['alfresco']['user']
+default['artifacts']['alfresco-rm-community-repo']['enabled'] = false
+
+# rm 2.5/2.4 community share
+default['artifacts']['alfresco-rm-community-share']['groupId'] = "org.alfresco"
+default['artifacts']['alfresco-rm-community-share']['artifactId'] = "alfresco-rm-community-share"
+default['artifacts']['alfresco-rm-community-share']['type'] = "amp"
+default['artifacts']['alfresco-rm-community-share']['owner'] = node['alfresco']['user']
+default['artifacts']['alfresco-rm-community-share']['enabled'] = false
+
+# rm 2.4 enterprise core repo
+default['artifacts']['alfresco-rm-core-repo']['groupId'] = "org.alfresco"
+default['artifacts']['alfresco-rm-core-repo']['artifactId'] = "alfresco-rm-core-repo"
+default['artifacts']['alfresco-rm-core-repo']['version'] = "2.4.0.1"
+default['artifacts']['alfresco-rm-core-repo']['type'] = "amp"
+default['artifacts']['alfresco-rm-core-repo']['owner'] = node['alfresco']['user']
+default['artifacts']['alfresco-rm-core-repo']['enabled'] = false
+
+# rm 2.4 enterprise core share
+default['artifacts']['alfresco-rm-core-share']['groupId'] = "org.alfresco"
+default['artifacts']['alfresco-rm-core-share']['artifactId'] = "alfresco-rm-core-share"
+default['artifacts']['alfresco-rm-core-share']['version'] = "2.4.0.1"
+default['artifacts']['alfresco-rm-core-share']['type'] = "amp"
+default['artifacts']['alfresco-rm-core-share']['owner'] = node['alfresco']['user']
+default['artifacts']['alfresco-rm-core-share']['enabled'] = false
+
+# rm 2.3 community/enterprise repo
+default['artifacts']['alfresco-rm-server']['groupId'] = "org.alfresco"
+default['artifacts']['alfresco-rm-server']['artifactId'] = "alfresco-rm-server"
+default['artifacts']['alfresco-rm-server']['type'] = "amp"
+default['artifacts']['alfresco-rm-server']['owner'] = node['alfresco']['user']
+default['artifacts']['alfresco-rm-server']['enabled'] = false
+
+# rm 2.3 community/enterprise share
+default['artifacts']['alfresco-rm-share']['groupId'] = "org.alfresco"
+default['artifacts']['alfresco-rm-share']['artifactId'] = "alfresco-rm-share"
+default['artifacts']['alfresco-rm-share']['type'] = "amp"
+default['artifacts']['alfresco-rm-share']['owner'] = node['alfresco']['user']
+default['artifacts']['alfresco-rm-share']['enabled'] = false