Skip to content

Commit

Permalink
Merge branch 'master' into fix-578a
Browse files Browse the repository at this point in the history
  • Loading branch information
iennae authored Aug 31, 2017
2 parents bf01a32 + b668486 commit 8bdafd7
Show file tree
Hide file tree
Showing 39 changed files with 163 additions and 458 deletions.
1 change: 0 additions & 1 deletion .foodcritic

This file was deleted.

162 changes: 29 additions & 133 deletions .kitchen.dokken.yml
Original file line number Diff line number Diff line change
@@ -1,179 +1,75 @@
driver:
name: dokken
privileged: true # because Docker and SystemD/Upstart
chef_image: chef/chef
chef_version: current
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>

transport:
name: dokken

provisioner:
name: dokken
deprecations_as_errors: true

verifier:
name: inspec

platforms:
- name: amazonlinux
driver:
image: dokken/amazonlinux
pid_one_command: /sbin/init

- name: debian-7
driver:
image: debian:7
image: dokken/debian-7
pid_one_command: /sbin/init
intermediate_instructions:
- RUN /usr/bin/apt-get update
- RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y

- name: debian-8
driver:
image: debian:8
image: dokken/debian-8
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: debian-9
driver:
image: dokken/debian-9
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update
- RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y

- name: centos-6
driver:
image: centos:6
platform: rhel
image: dokken/centos-6
pid_one_command: /sbin/init
intermediate_instructions:
- RUN yum -y install which initscripts

- name: centos-7
driver:
image: centos:7
platform: rhel
image: dokken/centos-7
pid_one_command: /usr/lib/systemd/systemd

- name: fedora-latest
driver:
image: dokken/fedora-latest
pid_one_command: /usr/lib/systemd/systemd
intermediate_instructions:
- RUN yum -y install lsof which systemd-sysv initscripts

- name: ubuntu-14.04
driver:
image: ubuntu-upstart:14.04
image: dokken/ubuntu-14.04
pid_one_command: /sbin/init
intermediate_instructions:
- RUN /usr/bin/apt-get update
- RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y

- name: ubuntu-16.04
driver:
image: ubuntu:16.04
image: dokken/ubuntu-16.04
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update
- RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y

suites:
#
# Smoke suite
#
- name: smoke_package_stable
run_list: jenkins_server_wrapper::default
attributes:
jenkins:
master:
install_method: package
- name: smoke_package_current
run_list: jenkins_server_wrapper::default
attributes:
jenkins:
master:
channel: current
install_method: package
- name: smoke_war_stable
run_list: jenkins_server_wrapper::default
attributes:
jenkins:
master:
install_method: war
source: https://updates.jenkins.io/stable/latest/jenkins.war
- name: smoke_war_latest
run_list: jenkins_server_wrapper::default
attributes:
jenkins:
master:
install_method: war
source: https://updates.jenkins.io/latest/jenkins.war

#
# Authentication suites
#
- name: authentication_private_key
run_list: jenkins_authentication::private_key
- name: authentication_username_password
run_list: jenkins_authentication::username_password

#
# Command suites
#
- name: jenkins_command_execute
run_list: jenkins_command::execute

#
# Credentials suites
#
- name: jenkins_credentials_create
run_list: jenkins_credentials::create
- name: jenkins_credentials_delete
run_list: jenkins_credentials::delete

#
# Job suites
#
- name: jenkins_job_create
run_list:
- jenkins_job::create
- jenkins_job::create_folder
- name: jenkins_job_delete
run_list: jenkins_job::delete
- name: jenkins_job_disable
run_list: jenkins_job::disable
- name: jenkins_job_enable
run_list: jenkins_job::enable
- name: jenkins_job_build
run_list: jenkins_job::build

#
# Script suites
#
- name: jenkins_script
run_list: jenkins_script::execute

#
# Plugin suites
#
- name: jenkins_plugin_disable
run_list: jenkins_plugin::disable
- name: jenkins_plugin_enable
run_list: jenkins_plugin::enable
- name: jenkins_plugin_install
run_list: jenkins_plugin::install
- name: jenkins_plugin_uninstall
run_list: jenkins_plugin::uninstall

#
# Slave suites
#
- name: jenkins_slave_create
run_list:
- jenkins_slave::create_jnlp
- jenkins_slave::create_ssh
- name: jenkins_slave_delete
run_list:
- jenkins_slave::delete_jnlp
- jenkins_slave::delete_ssh
- name: jenkins_slave_connect
run_list: jenkins_slave::connect
- name: jenkins_slave_disconnect
run_list: jenkins_slave::disconnect
- name: jenkins_slave_online
run_list: jenkins_slave::online
- name: jenkins_slave_offline
run_list: jenkins_slave::offline

#
# User suites
#
- name: jenkins_user_create
run_list: jenkins_user::create
- name: jenkins_user_delete
run_list: jenkins_user::delete
- name: opensuse-leap
driver:
image: dokken/opensuse-leap
pid_one_command: /bin/systemd
13 changes: 10 additions & 3 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@ provisioner:
mirror: https://updates.jenkins.io

platforms:
- name: centos-6.9
- name: centos-7.3
- name: debian-7.11
- name: debian-8.7
- name: debian-8.8
- name: debian-9.0
- name: ubuntu-14.04
- name: ubuntu-16.04
- name: centos-6.8
- name: centos-7.3

suites:
#
Expand All @@ -39,13 +40,19 @@ suites:
jenkins:
master:
install_method: package
excludes:
- ubuntu-14.04
- debian-7.11
- name: smoke_package_current
run_list: jenkins_server_wrapper::default
attributes:
jenkins:
master:
channel: current
install_method: package
excludes:
- ubuntu-14.04
- debian-7.11
- name: smoke_war_stable
run_list: jenkins_server_wrapper::default
attributes:
Expand Down
14 changes: 6 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
sudo: required
dist: trusty

# install the pre-release chef-dk.
addons:
apt:
sources:
Expand All @@ -21,23 +20,22 @@ services: docker
env:
matrix:
- INSTANCE=smoke-package-stable-centos-7
- INSTANCE=smoke-package-stable-ubuntu-1404
- INSTANCE=smoke-package-stable-ubuntu-1604
- INSTANCE=smoke-war-stable-centos-7
- INSTANCE=smoke-war-stable-ubuntu-1404
- INSTANCE=smoke-war-stable-ubuntu-1604

before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- eval "$(/opt/chefdk/bin/chef shell-init bash)"
- /opt/chefdk/embedded/bin/chef --version
- /opt/chefdk/embedded/bin/cookstyle --version
- /opt/chefdk/embedded/bin/foodcritic --version
- eval "$(chef shell-init bash)"
- chef --version
- cookstyle --version
- foodcritic --version

script: KITCHEN_LOCAL_YAML=.kitchen.dokken.yml /opt/chefdk/embedded/bin/kitchen verify ${INSTANCE}
script: KITCHEN_LOCAL_YAML=.kitchen.dokken.yml kitchen verify ${INSTANCE}

matrix:
include:
- script:
- /opt/chefdk/bin/chef exec delivery local all
- chef exec delivery local all
env: UNIT_AND_LINT=1
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,33 @@

This file is used to list changes made in each version of the jenkins cookbook.

## 5.0.4 (2017-08-28)

- Modified case statements to support package installation on Amazon Linux
- Changes endpoint for 'wait_until_ready' helper
- Fix permissions for plugin files downloaded from update center
- Wait for Jenkins in case of EADDRNOTAVAIL
- Change groovy scripts to use stdin instead of file. Fixes #620
- And change test to expect new format
- Ensure that we only reject the '-i key' part and not, for instance, parts that contain '-i' in larger strings.

## 5.0.3 (2017-07-04)

- Removed mention of Amazon Linux support from the readme. We will support this in the future, but at the moment the cookbook does not actually support Amazon Linux
- Note that Package installs of Jenkins now require Debian 9+ and Ubuntu 16.04+ due to Jenkins 2.66 now requiring Java 8 packages to be present
- Fix credentials_private_key to handle passphrase being nil
- Improve idempotence of user resource in case properties are not defined in the new resource
- Make sure plugin path has file:// appended
- Fix some typos in credentials_user that caused failures
- Remove foodcritic file we no longer need
- Remove the rakefile since we have delivery local mode now
- Remove maintainers logic and instead include a maintainers blurb in the readme
- Speed up specs and resolve deprecations

## 5.0.2 (2017-06-14)

- Fix regex for falling back to anonymous for failed authentication

## 5.0.1 (2017-05-01)

- Add -remoting option that is required due to [Jenkins issue](https://jenkins.io/blog/2017/04/26/security-advisory/). Attribute `['jenkins']['executor']['protocol']` has been added to allow for using the deprecated remoting option (default) or ssh/http in which attribute `['jenkins']['executor']['cli_user']` needs to be assigned.
Expand Down
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@

source 'https://rubygems.org'

gem 'tomlrb'
gem 'rake'
gem 'stove'
gem 'community_cookbook_releaser'
19 changes: 0 additions & 19 deletions MAINTAINERS.md

This file was deleted.

Loading

0 comments on commit 8bdafd7

Please sign in to comment.