From 5af9b578d4db8ec8eb9e187043f878192886da9b Mon Sep 17 00:00:00 2001 From: Dan Webb Date: Wed, 16 Oct 2019 15:45:16 +0100 Subject: [PATCH 1/6] Fix changelog and the CircleCI version --- .circleci/config.yml | 2 +- CHANGELOG.md | 84 +++++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 38 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7eb945c..de6d708 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: - kitchen: sous-chefs/kitchen@1.0.0 + kitchen: sous-chefs/kitchen@2 workflows: kitchen: diff --git a/CHANGELOG.md b/CHANGELOG.md index c904084..d3ec9c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,42 +1,50 @@ # Confluence Cookbook Changelog -## 2.5.0 (March 10, 2019) -BUG FIX: +## 2.5.1 (2019/08/16) + +- Update CircleCI version +- Run cookstyle on repo (fixes #187) +- ISO-8601 date format for the CHANGLOG + +## 2.5.0 (2019/03/10) + - Added version pin for Apache2 -## 2.5.0 (October 24, 2018) -IMPROVEMENTS: +## 2.5.0 (2018/10/24) + - Added hash values to support for Confluence version `6.8.2`. -## 2.5.0 (May 10, 2018) +## 2.5.0 (2018/05/10) + - Changed cookbook ownership to Sous Chefs Community. Hopefully cookbook will come back to life. -## 2.4.3 (July 12, 2017) -IMPROVEMENTS: +## 2.4.3 (2017/07/12) + - Added hash values and support for Confluence versions `6.2.1`, `6.2.2`, `6.2.3`, `6.3.1`. - Fix by style check suggestions. -## 2.4.2 (May 31, 2017) -IMPROVEMENTS: +## 2.4.2 (2017/05/31) + - Added hash values and support for Confluence versions `6.1.3`, `6.1.4` and `6.2.0`. -## 2.4.1 (April 26, 2017) -IMPROVEMENTS: +## 2.4.1 (2017/04/26) + - Added hash values and support for Confluence v6.1.2 -## 2.4.0 (April 6, 2017) -IMPROVEMENTS: +## 2.4.0 (2017/04/06) + - Added hash values and support for Confluence v6.0.5 and v6.1.1 - Added restriction to avoid testing with Chef Client v13 for now -## 2.3.0 (February 23, 2017) -IMPROVEMENTS: +## 2.3.0 (2017/02/23) + - Added autotune feature for configuring jvm settings. see README.md for details. [[GH-140]](https://github.com/parallels-cookbooks/confluence/pull/140) - Add temporary workaround for [CONF-35722](https://jira.atlassian.com/browse/CONF-35722). [[GH-148]](https://github.com/parallels-cookbooks/confluence/pull/148) -## 2.2.0 (December 28, 2016) +## 2.2.0 (2016/12/28) + +Improvements: -IMPROVEMENTS: - Added support of Confluence 5.10.4, 5.10.5, 5.10.6, 5.10.7, 5.10.8, 6.0.1, 6.0.2. [[GH-127]](https://github.com/parallels-cookbooks/confluence/pull/127) @@ -47,23 +55,25 @@ IMPROVEMENTS: - Don't redirect /server-status for monitoring systems [[GH-128]](https://github.com/parallels-cookbooks/confluence/pull/128) -BUG FIXES: +Bug fixes: + - Add a matching quote to JAVA_OPTS variable. [[GH-124]](https://github.com/parallels-cookbooks/confluence/pull/124) - Fix initial service start after installing Confluence with .bin installer on systemd-driven systems. [[GH-136]](https://github.com/parallels-cookbooks/confluence/pull/136) -## 2.1.1 (August 5, 2016) +## 2.1.1 (2016/08/05) + +Improvements: -IMPROVEMENTS: - Added support of Confluence 5.10.2, 5.10.3. [[GH-118]](https://github.com/parallels-cookbooks/confluence/pull/118) [[GH-120]](https://github.com/parallels-cookbooks/confluence/pull/120) -## 2.1.0 (July 13, 2016) +## 2.1.0 (2016/06/13) -BACKWARDS INCOMPATIBILITIES: +Backwards incompatibilities: - Dropped support of Confluence < 5.5, since they've reached their EOL date. [[GH-106]](https://github.com/parallels-cookbooks/confluence/pull/106) @@ -75,7 +85,7 @@ IMPROVEMENTS: - Added attribute `['confluence']['jvm']['bundled_jre']` allowing to manage custom JRE by `java` cookbook regardless of `install_type`. - [[GH-111]](https://github.com/parallels-cookbooks/confluence/pull/111) + [[GH-111]](https://github.com/parallels-cookbooks/confluence/pull/111) - Added support of Confluence 5.9.9, 5.9.10, 5.10.1. [[GH-107]](https://github.com/parallels-cookbooks/confluence/pull/107) [[GH-115]](https://github.com/parallels-cookbooks/confluence/pull/115) @@ -85,7 +95,7 @@ IMPROVEMENTS: - Removes non-dynamic template for `web.xml` config. [[GH-116]](https://github.com/parallels-cookbooks/confluence/pull/116) -BUG FIXES: +Bug fixes: - postgres: Set "utf-8" encoding, "C" collation and "template0". [[GH-108]](https://github.com/parallels-cookbooks/confluence/pull/108) @@ -95,7 +105,7 @@ BUG FIXES: - Fixed `conf` directory permissions. [[GH-99]](https://github.com/parallels-cookbooks/confluence/pull/99) -## 2.0.0 (February 20, 2016) +## 2.0.0 (2016/02/20) BACKWARDS INCOMPATIBILITIES: @@ -145,7 +155,7 @@ IMPROVEMENTS: - Removed unsupported and non-implemented installer types [[GH-27]](https://github.com/parallels-cookbooks/confluence/pull/27) -BUG FIXES: +Bug fixes: - Fixed issues of derived attributes [[GH-30]](https://github.com/parallels-cookbooks/confluence/pull/30) @@ -167,46 +177,46 @@ BUG FIXES: [[GH-47]](https://github.com/parallels-cookbooks/confluence/pull/47) [[GH-89]](https://github.com/parallels-cookbooks/confluence/pull/89) -## 1.7.1 (January 2, 2014) +## 1.7.1 (2014/01/02) -BUG FIXES: +Bug fixes: - Fixed chef-solo run failure with `java_ark` resource notification [[GH-2]](https://github.com/parallels-cookbooks/confluence/issues/2) -## 1.7.0 (October 5, 2013) +## 1.7.0 (2013/10/05) - Bump default version of Confluence to 5.3 -## 1.6.0 (August 21, 2013) +## 1.6.0 (2013/08/21) - Bump default version of Confluence to 5.2.3 -## 1.5.0 (August 8, 2013) +## 1.5.0 (2013/08/08) - Bump default version of Confluence to 5.1.5 -## 1.4.0 (July 24, 2013) +## 1.4.0 (2013/07/24) - Bump default version of Confluence to 5.1.4 -## 1.3.0 (May 16, 2013) +## 1.3.0 (2013/05/16) - Bump default version of Confluence to 5.1.3 -## 1.2.1 (April 16, 2013) +## 1.2.1 (2013/04/16) - Fix Apache log file names -## 1.2.0 (March 29, 2013) +## 1.2.0 (2013/03/29) - Bump default version of Confluence to 5.1.0 - Update Vagrant box URLs to Chef 11.2.0 since its tested and works -## 1.1.0 (February 28, 2013) +## 1.1.0 (2013/02/28) - Bump default version of Confluence to 5.0.1 -## 1.0.0 (February 16, 2013) +## 1.0.0 (2013/02/16) - Production ready with Linux installer/standalone installs - Split out individual recipes for installation and configuration From 5721f4ff438e268203e41d5790cb3a5486b47fe8 Mon Sep 17 00:00:00 2001 From: Dan Webb Date: Wed, 16 Oct 2019 15:46:26 +0100 Subject: [PATCH 2/6] Update the owner information in metadata.rb --- CHANGELOG.md | 1 + metadata.rb | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3ec9c2..e904746 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 2.5.1 (2019/08/16) +- Update the owner information in metadata.rb - Update CircleCI version - Run cookstyle on repo (fixes #187) - ISO-8601 date format for the CHANGLOG diff --git a/metadata.rb b/metadata.rb index 95dc2db..eab58ff 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,9 +1,9 @@ name 'confluence' -maintainer 'Azat Khadiev' -maintainer_email 'anuriq@gmail.com' +maintainer 'Sous-Chef' +maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' description 'Installs/Configures Atlassian Confluence' - +chef_version '< 13.0.0' version '2.5.1' issues_url 'https://github.com/sous-chefs/confluence/issues' @@ -23,5 +23,3 @@ depends 'mysql_connector' depends 'mysql2_chef_gem', '< 2.0.0' depends 'postgresql' - -chef_version '< 13.0.0' From 7340d6b388db5b8dbb9ab3922ec82d628306ae30 Mon Sep 17 00:00:00 2001 From: Dan Webb Date: Wed, 16 Oct 2019 15:48:52 +0100 Subject: [PATCH 3/6] Update the linting config in circleci --- .circleci/config.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index de6d708..08f348b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,8 +6,12 @@ orbs: workflows: kitchen: jobs: + - kitchen/yamllint: + name: lint-yaml + - kitchen/mdlint: + name: lint-markdown - kitchen/danger: name: danger context: Danger - - kitchen/lint: - name: lint + - kitchen/delivery: + name: delivery From 310f618bae84167ff08f1da7209213a09823c132 Mon Sep 17 00:00:00 2001 From: Dan Webb Date: Wed, 16 Oct 2019 15:51:05 +0100 Subject: [PATCH 4/6] Update linting and kitchen configs --- .circleci/config.yml | 5 +++-- .foodcritic | 2 -- .github/ISSUE_TEMPLATE.md | 20 -------------------- .github/PULL_REQUEST_TEMPLATE.md | 12 ------------ .kitchen.digitalocean.yml | 17 ----------------- .rubocop.yml | 3 --- .kitchen.docker.yml => kitchen.docker.yml | 0 .kitchen.yml => kitchen.yml | 0 8 files changed, 3 insertions(+), 56 deletions(-) delete mode 100644 .foodcritic delete mode 100644 .github/ISSUE_TEMPLATE.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 .kitchen.digitalocean.yml delete mode 100644 .rubocop.yml rename .kitchen.docker.yml => kitchen.docker.yml (100%) rename .kitchen.yml => kitchen.yml (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 08f348b..2a68574 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,3 +1,4 @@ +--- version: 2.1 orbs: @@ -13,5 +14,5 @@ workflows: - kitchen/danger: name: danger context: Danger - - kitchen/delivery: - name: delivery + # - kitchen/delivery: + # name: delivery diff --git a/.foodcritic b/.foodcritic deleted file mode 100644 index 5e32670..0000000 --- a/.foodcritic +++ /dev/null @@ -1,2 +0,0 @@ -~FC009 -~FC080 diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 651e753..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,20 +0,0 @@ -### Cookbook version -[Version of the cookbook where you are encountering the issue] - -### Chef-client version -[Version of chef-client in your environment] - -### Platform Details -[Operating system distribution and release version. Cloud provider if running in the cloud] - -### Scenario: -[What you are trying to achieve and you can't?] - -### Steps to Reproduce: -[If you are filing an issue what are the things we need to do in order to repro your problem? How are you using this cookbook or any resources it includes?] - -### Expected Result: -[What are you expecting to happen as the consequence of above reproduction steps?] - -### Actual Result: -[What actually happens after the reproduction steps? Include the error output or a link to a gist if possible.] diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index af09b2e..0000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,12 +0,0 @@ -## Description - -[Describe what this change achieves] - -### Issues Resolved - -[List any existing issues this PR resolves] - -### Check List -- [ ] All tests pass. See https://github.com/sous-chefs/apache2/blob/master/TESTING.md -- [ ] New functionality includes testing. -- [ ] New functionality has been documented in the README if applicable diff --git a/.kitchen.digitalocean.yml b/.kitchen.digitalocean.yml deleted file mode 100644 index e373cf0..0000000 --- a/.kitchen.digitalocean.yml +++ /dev/null @@ -1,17 +0,0 @@ -driver: - name: digitalocean - private_networking: false - size: 2gb - -transport: - name: rsync - -provisioner: - attributes: - apt: - compile_time_update: true - client_rb: - formatters: - # Keeps logs concise for parallelism. - # Travis CI will also cancel job if logs get over 4MB. - - :minimal diff --git a/.rubocop.yml b/.rubocop.yml deleted file mode 100644 index 6562000..0000000 --- a/.rubocop.yml +++ /dev/null @@ -1,3 +0,0 @@ -AllCops: - Exclude: - - 'Dangerfile' diff --git a/.kitchen.docker.yml b/kitchen.docker.yml similarity index 100% rename from .kitchen.docker.yml rename to kitchen.docker.yml diff --git a/.kitchen.yml b/kitchen.yml similarity index 100% rename from .kitchen.yml rename to kitchen.yml From e1c2848e9542b3a2e24e69538d164ecf1be82239 Mon Sep 17 00:00:00 2001 From: Dan Webb Date: Wed, 16 Oct 2019 15:55:32 +0100 Subject: [PATCH 5/6] Fix markdown --- .mdlrc | 1 + CONTRIBUTING.md | 120 +++++------------------------------------------- README.md | 4 +- TESTING.md | 6 +-- 4 files changed, 16 insertions(+), 115 deletions(-) create mode 100644 .mdlrc diff --git a/.mdlrc b/.mdlrc new file mode 100644 index 0000000..ebeef65 --- /dev/null +++ b/.mdlrc @@ -0,0 +1 @@ +rules "~MD013", "~MD024" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9ae9a56..4ed8a11 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,119 +1,21 @@ -# Contributing to Parallels Cookbooks +# Contributing -We're glad you want to contribute to Parallels Cookbooks! The first -step is the desire to improve the project. +## Branches -## Quick Contributing Steps +### `master` branch -1. Create an account on [GitHub](https://github.com). -2. Create a pull request for your change on [GitHub](https://github.com). -3. The community cookbook maintainers will review your change, and either merge -the change or offer suggestions. +The master branch is the current committed changes. These changes may not yet be released although we try to release often. -## Using git +## Tags -You can copy a chef cookbook repository to your local workstation by running -`git clone git://github.com/parallels-cookbooks/COOKBOOKNAME.git`. +All releases are tagged in git. To see the releases available to you see the changelog or the tags directly. -For collaboration purposes, it is best if you create a GitHub account -and fork the repository to your own account. Once you do this you will -be able to push your changes to your GitHub repository for others to -see and use. +## Pull requests -If you have another repository in your GitHub account named the same -as the cookbook, we suggest you suffix the repository with `-cookbook`. +- -### Branches and Commits +## Issues -You should submit your patch as a git branch named after the Github -issue, such as GH-22. This is called a _topic branch_ and allows users -to associate a branch of code with the ticket. +Need to report an issue? Use the github issues: -It is a best practice to have your commit message have a _summary -line_ that includes the ticket number, followed by an empty line and -then a brief description of the commit. This also helps other -contributors understand the purpose of changes to the code. - -```text - [GH-22] - platform_family and style - - * use platform_family for platform checking - * update notifies syntax to "resource_type[resource_name]" instead of - resources() lookup - * GH-692 - delete config files dropped off by packages in conf.d - * dropped debian 4 support because all other platforms have the same - values, and it is older than "old stable" debian release -``` - -Remember that not all users use Chef in the same way or on the same -operating systems as you, so it is helpful to be clear about your use -case and change so they can understand it even when it doesn't apply -to them. - -### More information - -Additional help with git is available on the [Community -Contributions](https://docs.chef.io/community_contributions.html#use-git) -page on the Chef Docs site. - -## Functional and Unit Tests - -Chef cookbooks are tested with functional and unit tests to ensure -changes don't cause regressions for other use cases. Ideally all -changes include either functional or unit tests. See the TESTING.md -file for additional information on testing in chef cookbooks. - -## Code Review - -Cookbook maintainers regularly review code contributions and provide suggestions -for improvement in the code itself or the implementation. - -## Release Cycle - -The versioning for Parallels cookbooks is X.Y.Z. - -* X is a major release, which may not be fully compatible with prior major -releases -* Y is a minor release, which adds both new features and bug fixes -* Z is a patch release, which adds just bug fixes - -See the [Cookbook Versioning Policy](https://chef-community.github.io/cvp/) for -more guidance on semantic versioning of cookbooks. - -## Working with the community - -These resources will help you learn more about Chef and connect to -other members of the Chef community: - -* [Chef Community Guidelines](https://docs.chef.io/community_guidelines.html) -* [Chef Mailing List](https://discourse.chef.io/c/dev) -* #chef and #chef-hacking IRC channels on irc.freenode.net -* [Supermarket site](https://supermarket.chef.io) -* [Chef Docs](https://docs.chef.io) - -## Contribution Do's and Don't's - -Please do include tests for your contribution. If you need help, ask -on the -[chef-dev mailing list](https://discourse.chef.io/c/dev) -or the -[#chef-hacking IRC channel](https://community.chef.io/chat/chef-hacking). -Not all platforms that a cookbook supports may be supported by Test -Kitchen. Please provide evidence of testing your contribution if it -isn't trivial so we don't have to duplicate effort in testing. - -Please do indicate new platform (families) or platform versions in the -commit message, and update the relevant ticket. - -Please do ensure that your changes do not break or modify behavior for -other platforms supported by the cookbook. For example if your changes -are for Debian, make sure that they do not break on CentOS. - -Please do **not** modify the version number in the `metadata.rb`, cookbook -maintainers will select the appropriate version based on the release cycle -information above. - -Please do **not** update the `CHANGELOG.md` for a new version. Not all -changes to a cookbook may be merged and released in the same versions. -Cookbook maintainers will update the `CHANGELOG.md` when releasing a new -version of the cookbook. +- diff --git a/README.md b/README.md index 5420016..9d183e7 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ bundled_jre | prefer JRE bundled with linux installer | Boolean | true ### Confluence Autotune Attributes These attributes are under the `node['confluence']['autotune']` namespace. Autotune automatically determines appropriate settings for certain -attributes. This feature is inspired by the `autotune` recipe in the https://github.com/afklm/jira cookbook. This +attributes. This feature is inspired by the `autotune` recipe in the cookbook. This initial version only supports JVM min and max memory size tuning. There are several tuning types that can be set: @@ -153,7 +153,7 @@ Example: } ``` -_(Note - `"confluence"` nesting level is required!)_ +*Note - `"confluence"` nesting level is required!* These credentials will be used for your Confluence installation instead of appropriate attribute values. diff --git a/TESTING.md b/TESTING.md index 28c320b..bde0639 100644 --- a/TESTING.md +++ b/TESTING.md @@ -5,7 +5,7 @@ Chef cookbooks require either a working ChefDK installation set as your system's default ruby or Ruby 2.0+ with bundler installed. Using ChefDK provides a consistent Ruby install, and is the suggested method. -ChefDK can be downloaded at https://downloads.chef.io/chef-dk/ +ChefDK can be downloaded at Integration testing relies on Hashicorp's [Vagrant](https://www.vagrantup.com/downloads.html) and local virtualization system Oracle's [Virtualbox](https://www.virtualbox.org/wiki/Downloads), @@ -39,8 +39,7 @@ individually, or in groups. Typing "rake" by itself will perform the default checks: style checks (Rubocop and Foodcritic), and unit tests (Chefspec). To see a complete list of available tasks run `rake -T` - -``` +```shell $ rake -T rake integration: # Run kitchen integration tests rake spec # Run ChefSpec examples @@ -50,7 +49,6 @@ rake style:ruby # Run Ruby style checks rake style:ruby:auto_correct # Auto-correct RuboCop offenses ``` - ## Spec Testing Unit testing is done by running Rspec examples. Rspec will test any libraries, From 25374371a5b1e2cddafd6114335251a12244444c Mon Sep 17 00:00:00 2001 From: Dan Webb Date: Wed, 16 Oct 2019 16:00:04 +0100 Subject: [PATCH 6/6] Yamllint --- .circleci/config.yml | 2 - .github/lock.yml | 22 +------- .github/workflows/branchcleanup.yml | 2 +- .yamllint | 6 +++ kitchen.docker.yml | 77 --------------------------- kitchen.dokken.yml | 51 ++++++++++++++++++ kitchen.yml | 82 ++++++++++++----------------- 7 files changed, 94 insertions(+), 148 deletions(-) create mode 100644 .yamllint delete mode 100644 kitchen.docker.yml create mode 100644 kitchen.dokken.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 2a68574..38ed26e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,5 +14,3 @@ workflows: - kitchen/danger: name: danger context: Danger - # - kitchen/delivery: - # name: delivery diff --git a/.github/lock.yml b/.github/lock.yml index 9703715..8344a7b 100644 --- a/.github/lock.yml +++ b/.github/lock.yml @@ -1,28 +1,8 @@ -# Configuration for lock-threads - https://github.com/dessant/lock-threads - -# Number of days of inactivity before a closed issue or pull request is locked +--- daysUntilLock: 365 - -# Issues and pull requests with these labels will not be locked. Set to `[]` to disable exemptLabels: [] - -# Label to add before locking, such as `outdated`. Set to `false` to disable lockLabel: false - -# Comment to post before locking. Set to `false` to disable lockComment: > This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. - -# Limit to only `issues` or `pulls` -# only: issues - -# Optionally, specify configuration settings just for `issues` or `pulls` -# issues: -# exemptLabels: -# - help-wanted -# lockLabel: outdated - -# pulls: -# daysUntilLock: 30 diff --git a/.github/workflows/branchcleanup.yml b/.github/workflows/branchcleanup.yml index bbc44e9..ffba9d7 100644 --- a/.github/workflows/branchcleanup.yml +++ b/.github/workflows/branchcleanup.yml @@ -2,7 +2,7 @@ name: Branch Cleanup # This workflow is triggered on all closed pull requests. # However the script does not do anything it a merge was not performed. -on: +"on": pull_request: types: [closed] diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..9eefd87 --- /dev/null +++ b/.yamllint @@ -0,0 +1,6 @@ +extends: default +ignore: .kitchen/ +rules: + line-length: + max: 120 + level: warning diff --git a/kitchen.docker.yml b/kitchen.docker.yml deleted file mode 100644 index 77722ef..0000000 --- a/kitchen.docker.yml +++ /dev/null @@ -1,77 +0,0 @@ -driver: - name: dokken - privileged: true # because Docker and SystemD/Upstart - chef_image: chef/chef - chef_version: 12.19.36 - -transport: - name: dokken - -provisioner: - name: dokken - attributes: - java: - install_flavor: oracle - jdk_version: 8 - oracle: - accept_oracle_download_terms: true - client_rb: - diff_disabled: true - -platforms: -- name: centos-6 - driver: - image: centos:6 - platform: rhel - pid_one_command: /sbin/init - intermediate_instructions: - - RUN yum -y install openssl which initscripts net-tools wget sudo - -- name: centos-7 - driver: - image: centos:7 - platform: rhel - pid_one_command: /usr/lib/systemd/systemd - intermediate_instructions: - - RUN yum -y install openssl lsof which systemd-sysv initscripts wget net-tools sudo - -- name: ubuntu-14.04 - driver: - image: ubuntu-upstart:14.04 - pid_one_command: /sbin/init - intermediate_instructions: - - RUN /usr/bin/apt-get update - - RUN /usr/bin/apt-get install openssl apt-transport-https lsb-release procps net-tools sudo -y - -- name: ubuntu-16.04 - driver: - image: ubuntu:16.04 - pid_one_command: /bin/systemd - intermediate_instructions: - - RUN /usr/bin/apt-get update - - RUN /usr/bin/apt-get install openssl apt-transport-https lsb-release procps net-tools sudo -y - -suites: -- name: installer-mysql - run_list: - - recipe[confluence_test::mysql] - -- name: installer-postgresql - run_list: - - recipe[confluence_test::postgresql] - -- name: standalone-mysql - run_list: - - recipe[java] - - recipe[confluence_test::mysql] - attributes: - confluence: - install_type: standalone - -- name: standalone-postgresql - run_list: - - recipe[java] - - recipe[confluence_test::postgresql] - attributes: - confluence: - install_type: standalone diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml new file mode 100644 index 0000000..3677df7 --- /dev/null +++ b/kitchen.dokken.yml @@ -0,0 +1,51 @@ +--- +driver: + name: dokken + privileged: true + +transport: + name: dokken + +provisioner: + name: dokken + attributes: + java: + install_flavor: oracle + jdk_version: 8 + oracle: + accept_oracle_download_terms: true + client_rb: + diff_disabled: true + +platforms: + - name: centos-6 + driver: + image: centos:6 + platform: rhel + pid_one_command: /sbin/init + intermediate_instructions: + - RUN yum -y install openssl which initscripts net-tools wget sudo + + - name: centos-7 + driver: + image: centos:7 + platform: rhel + pid_one_command: /usr/lib/systemd/systemd + intermediate_instructions: + - RUN yum -y install openssl lsof which systemd-sysv initscripts wget net-tools sudo + + - name: ubuntu-14.04 + driver: + image: ubuntu-upstart:14.04 + pid_one_command: /sbin/init + intermediate_instructions: + - RUN /usr/bin/apt-get update + - RUN /usr/bin/apt-get install openssl apt-transport-https lsb-release procps net-tools sudo -y + + - name: ubuntu-16.04 + driver: + image: ubuntu:16.04 + pid_one_command: /bin/systemd + intermediate_instructions: + - RUN /usr/bin/apt-get update + - RUN /usr/bin/apt-get install openssl apt-transport-https lsb-release procps net-tools sudo -y diff --git a/kitchen.yml b/kitchen.yml index 338f7b0..d906081 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -10,33 +10,21 @@ driver: auto_correct: true platforms: -- name: centos-6 - driver: - box: bento/centos-6.7 # vagrant - image: centos-6-5-x64 # digitalocean - -- name: centos-7 - driver: - box: bento/centos-7.1 - image: centos-7-0-x64 - -- name: ubuntu-14.04 - run_list: - - recipe[apt] - driver: - box: bento/ubuntu-14.04 - image: ubuntu-14-04-x64 - -- name: ubuntu-16.04 - run_list: - - recipe[apt] - driver: - box: bento/ubuntu-16.04 - image: ubuntu-16-04-x64 + - name: amazonlinux-2 + driver_config: + box: ywatase/amzn2 + - name: centos-6 + - name: centos-7 + - name: debian-8 + - name: debian-9 + - name: ubuntu-16.04 + - name: ubuntu-18.04 provisioner: name: chef_zero - require_chef_omnibus: "12" + product_name: chef + product_version: <%= ENV['CHEF_VERSION'] || 'latest' %> + install_strategy: once attributes: java: install_flavor: oracle @@ -45,26 +33,26 @@ provisioner: accept_oracle_download_terms: true suites: -- name: installer-mysql - run_list: - - recipe[confluence_test::mysql] - -- name: installer-postgresql - run_list: - - recipe[confluence_test::postgresql] - -- name: standalone-mysql - run_list: - - recipe[java] - - recipe[confluence_test::mysql] - attributes: - confluence: - install_type: standalone - -- name: standalone-postgresql - run_list: - - recipe[java] - - recipe[confluence_test::postgresql] - attributes: - confluence: - install_type: standalone + - name: installer-mysql + run_list: + - recipe[confluence_test::mysql] + + - name: installer-postgresql + run_list: + - recipe[confluence_test::postgresql] + + - name: standalone-mysql + run_list: + - recipe[java] + - recipe[confluence_test::mysql] + attributes: + confluence: + install_type: standalone + + - name: standalone-postgresql + run_list: + - recipe[java] + - recipe[confluence_test::postgresql] + attributes: + confluence: + install_type: standalone