opscode2chef

sous-chefs · Feb 18, 2015 · 7411eb5 · 7411eb5
1 parent 79f4d18
commit 7411eb5
Show file tree

Hide file tree

Showing 24 changed files with 43 additions and 43 deletions.
diff --git a/Berksfile b/Berksfile
@@ -1,4 +1,4 @@
-source 'https://api.berkshelf.com'
+source 'https://supermarket.chef.io'
 metadata
 
 group :integration do

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -174,40 +174,40 @@ v2.0.0 (2014-01-14)
 v1.2.2
 ------
 ### Bug
-- **[COOK-3742](https://tickets.opscode.com/browse/COOK-3742)** - Remove trailing comma (restores compatability with Ruby 1.8)
+- **[COOK-3742](https://tickets.chef.io/browse/COOK-3742)** - Remove trailing comma (restores compatability with Ruby 1.8)
 
 
 v1.2.0
 ------
 ### Improvement
-- **[COOK-3710](https://tickets.opscode.com/browse/COOK-3710)** - Allow winsw url to be changed with a node attribute
+- **[COOK-3710](https://tickets.chef.io/browse/COOK-3710)** - Allow winsw url to be changed with a node attribute
 
 ### Bug
-- **[COOK-3709](https://tickets.opscode.com/browse/COOK-3709)** - Use correct attribute value for `java_home`
-- **[COOK-3701](https://tickets.opscode.com/browse/COOK-3701)** - Fix a refactor bug where a template variable was removed that was used in a nested template
-- **[COOK-3594](https://tickets.opscode.com/browse/COOK-3594)** - Fix MiniTest Chef Handler tests for directory permissions
+- **[COOK-3709](https://tickets.chef.io/browse/COOK-3709)** - Use correct attribute value for `java_home`
+- **[COOK-3701](https://tickets.chef.io/browse/COOK-3701)** - Fix a refactor bug where a template variable was removed that was used in a nested template
+- **[COOK-3594](https://tickets.chef.io/browse/COOK-3594)** - Fix MiniTest Chef Handler tests for directory permissions
 
 
 v1.1.0
 ------
 ### Bug
-- **[COOK-3683](https://tickets.opscode.com/browse/COOK-3683)** - Fix plugin provider failures finding the current plugin version
-- **[COOK-3667](https://tickets.opscode.com/browse/COOK-3667)** - Unbreak Travis-CI integration
-- **[COOK-3623](https://tickets.opscode.com/browse/COOK-3623)** - Fix issue where plugins were never updated even if you bump the plugin version in attributes
-- **[COOK-3620](https://tickets.opscode.com/browse/COOK-3620)** - Fix Jenkins `_node_jnlp_test.rb` assumptions
-- **[COOK-3517](https://tickets.opscode.com/browse/COOK-3517)** - Various bug fixes for `jenkins::windows`
-- **[COOK-3516](https://tickets.opscode.com/browse/COOK-3516)** - Fix Jenkins slaves that use JNLP when Jenkins has security enabled
+- **[COOK-3683](https://tickets.chef.io/browse/COOK-3683)** - Fix plugin provider failures finding the current plugin version
+- **[COOK-3667](https://tickets.chef.io/browse/COOK-3667)** - Unbreak Travis-CI integration
+- **[COOK-3623](https://tickets.chef.io/browse/COOK-3623)** - Fix issue where plugins were never updated even if you bump the plugin version in attributes
+- **[COOK-3620](https://tickets.chef.io/browse/COOK-3620)** - Fix Jenkins `_node_jnlp_test.rb` assumptions
+- **[COOK-3517](https://tickets.chef.io/browse/COOK-3517)** - Various bug fixes for `jenkins::windows`
+- **[COOK-3516](https://tickets.chef.io/browse/COOK-3516)** - Fix Jenkins slaves that use JNLP when Jenkins has security enabled
 
 ### New Feature
-- **[COOK-3619](https://tickets.opscode.com/browse/COOK-3619)** - Support intermediate SSL certificates
+- **[COOK-3619](https://tickets.chef.io/browse/COOK-3619)** - Support intermediate SSL certificates
 
 ### Improvement
-- **[COOK-3587](https://tickets.opscode.com/browse/COOK-3587)** - Adding minitest-handler to the runlist for the node suite in Jenkins cookbook
+- **[COOK-3587](https://tickets.chef.io/browse/COOK-3587)** - Adding minitest-handler to the runlist for the node suite in Jenkins cookbook
 
 v1.0.0
 ------
 
-- Initial Opscode release
+- Initial Chef Software release
 
 v0.7.0
 ------

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -23,7 +23,7 @@ This second details Pull Requests that we will **not** merge.
 
 1. New features without accompanying Test Kitchen tests
 1. New features without accompanying usage documentation
-1. Pull requests with a broken build (Travis will automatically mark the build as passing/failing on GitHub, but you can also check the build manually by visiting https://travis-ci.org/opscode-cookbooks/jenkins)
+1. Pull requests with a broken build (Travis will automatically mark the build as passing/failing on GitHub, but you can also check the build manually by visiting https://travis-ci.org/chef-cookbooks/jenkins)
 
 
 Coding Standards
@@ -51,14 +51,14 @@ Developing this cookbook requires a sane Ruby 1.9+ environment with `bundler` in
 - [VirtualBox](https://virtualbox.org)
 
 ### CLA
-For non-trival updates (such as new features or bugfixes), we do require a Contributor License Agreement from Chef Software. If you have already signed a CLA under Opscode or Chef Software, you are already covered. For more information, see [Chef Software's Contribution Guidelines](https://wiki.opscode.com/display/chef/How+to+Contribute), but please note that we do **not** use the JIRA ticketing system.
+For non-trival updates (such as new features or bugfixes), we do require a Contributor License Agreement from Chef Software. If you have already signed a CLA under Chef Software or Chef Software, you are already covered. For more information, see [Chef Software's Contribution Guidelines](https://wiki.chef.io/display/chef/How+to+Contribute), but please note that we do **not** use the JIRA ticketing system.
 
 
 Process
 -------
 1. Clone the git repository from GitHub:
 
-        $ git clone git@github.com:opscode-cookbooks/jenkins.git
+        $ git clone git@github.com:chef-cookbooks/jenkins.git
 
 2. Install the dependencies using bundler:
 

diff --git a/ISSUES.md b/ISSUES.md
@@ -40,4 +40,4 @@ Here's a snippet you can copy-paste into the issue and fill out:
     ```
 ```
 
-[Create a ticket](https://github.com/opscode-cookbooks/jenkins/issues/new) describing your problem and include the information above.
+[Create a ticket](https://github.com/chef-cookbooks/jenkins/issues/new) describing your problem and include the information above.
diff --git a/README.md b/README.md
@@ -1,13 +1,13 @@
 jenkins Cookbook
 ================
-[![Build Status](http://img.shields.io/travis/opscode-cookbooks/jenkins.svg)][travis]
+[![Build Status](http://img.shields.io/travis/chef-cookbooks/jenkins.svg)][travis]
 
 
-[travis]: http://travis-ci.org/opscode-cookbooks/jenkins
+[travis]: http://travis-ci.org/chef-cookbooks/jenkins
 
 Installs and configures Jenkins CI master & node slaves. Resource providers to support automation via jenkins-cli, including job create/update.
 
-This project is managed by the CHEF Release Engineering team. For more information on the Release Engineering team's contribution, triage, and release process, please consult the [CHEF Release Engineering OSS Management Guide](https://docs.google.com/a/opscode.com/document/d/1oJB0vZb_3bl7_ZU2YMDBkMFdL-EWplW1BJv_FXTUOzg/edit).
+This project is managed by the CHEF Release Engineering team. For more information on the Release Engineering team's contribution, triage, and release process, please consult the [CHEF Release Engineering OSS Management Guide](https://docs.google.com/a/chef.io/document/d/1oJB0vZb_3bl7_ZU2YMDBkMFdL-EWplW1BJv_FXTUOzg/edit).
 
 Requirements
 ------------
@@ -520,7 +520,7 @@ Please see the [Contributing](CONTRIBUTING.md) and [Issue Reporting](ISSUES.md)
 License & Authors
 -----------------
 - Author: Seth Vargo <sethvargo@gmail.com>
-- Author: Seth Chisamore <schisamo@getchef.com>
+- Author: Seth Chisamore <schisamo@chef.io>
 - Original Author: Doug MacEachern <dougm@vmware.com>
 - Contributor: AJ Christensen <aj@junglist.gen.nz>
 - Contributor: Fletcher Nichol <fnichol@nichol.ca>

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -4,7 +4,7 @@
 #
 # Author: Doug MacEachern <dougm@vmware.com>
 # Author: Fletcher Nichol <fnichol@nichol.ca>
-# Author: Seth Chisamore <schisamo@getchef.com>
+# Author: Seth Chisamore <schisamo@chef.io>
 # Author: Seth Vargo <sethvargo@gmail.com>
 #
 # Copyright 2010, VMware, Inc.

diff --git a/attributes/master.rb b/attributes/master.rb
@@ -4,7 +4,7 @@
 #
 # Author: Doug MacEachern <dougm@vmware.com>
 # Author: Fletcher Nichol <fnichol@nichol.ca>
-# Author: Seth Chisamore <schisamo@getchef.com>
+# Author: Seth Chisamore <schisamo@chef.io>
 # Author: Seth Vargo <sethvargo@gmail.com>
 #
 # Copyright 2010, VMware, Inc.

diff --git a/libraries/_params_validate.rb b/libraries/_params_validate.rb
@@ -20,7 +20,7 @@
 #
 
 #
-# HACK: https://github.com/opscode/chef/pull/1559
+# HACK: https://github.com/chef/chef/pull/1559
 # This file can be removed when PR #1559 is merged.
 #
 require 'chef/mixin/params_validate'

diff --git a/libraries/credentials.rb b/libraries/credentials.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: jenkins
 # HWRP:: credentials
 #
-# Author:: Seth Chisamore <schisamo@getchef.com>
+# Author:: Seth Chisamore <schisamo@chef.io>
 #
 # Copyright 2013-2014, Chef Software, Inc.
 #

diff --git a/libraries/credentials_password.rb b/libraries/credentials_password.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: jenkins
 # HWRP:: credentials_password
 #
-# Author:: Seth Chisamore <schisamo@getchef.com>
+# Author:: Seth Chisamore <schisamo@chef.io>
 #
 # Copyright 2013-2014, Chef Software, Inc.
 #

diff --git a/libraries/credentials_private_key.rb b/libraries/credentials_private_key.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: jenkins
 # HWRP:: credentials_password
 #
-# Author:: Seth Chisamore <schisamo@getchef.com>
+# Author:: Seth Chisamore <schisamo@chef.io>
 #
 # Copyright 2013-2014, Chef Software, Inc.
 #

diff --git a/libraries/plugin.rb b/libraries/plugin.rb
@@ -3,7 +3,7 @@
 # HWRP:: plugin
 #
 # Author:: Seth Vargo <sethvargo@gmail.com>
-# Author:: Seth Chisamore <schisamo@getchef.com>
+# Author:: Seth Chisamore <schisamo@chef.io>
 #
 # Copyright 2013-2014, Chef Software, Inc.
 #
@@ -399,7 +399,7 @@ def plugin_installation_manifest(plugin_name)
     end
     #
     # Return the plugin version for +version+.
-    # https://github.com/opscode-cookbooks/jenkins/issues/292
+    # https://github.com/chef-cookbooks/jenkins/issues/292
     # Prefer to use Gem::Version as that will be more accurate than
     # comparing strings, but sadly Jenkins plugins may not always
     # follow "normal" version patterns

diff --git a/libraries/slave.rb b/libraries/slave.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: jenkins
 # HWRP:: slave
 #
-# Author:: Seth Chisamore <schisamo@getchef.com>
+# Author:: Seth Chisamore <schisamo@chef.io>
 #
 # Copyright 2013-2014, Chef Software, Inc.
 #

diff --git a/libraries/slave_jnlp.rb b/libraries/slave_jnlp.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: jenkins
 # HWRP:: jnlp_slave
 #
-# Author:: Seth Chisamore <schisamo@getchef.com>
+# Author:: Seth Chisamore <schisamo@chef.io>
 #
 # Copyright 2013-2014, Chef Software, Inc.
 #

diff --git a/libraries/slave_ssh.rb b/libraries/slave_ssh.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: jenkins
 # HWRP:: ssh_slave
 #
-# Author:: Seth Chisamore <schisamo@getchef.com>
+# Author:: Seth Chisamore <schisamo@chef.io>
 #
 # Copyright 2013-2014, Chef Software, Inc.
 #

diff --git a/libraries/slave_windows.rb b/libraries/slave_windows.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: jenkins
 # HWRP:: windows_slave
 #
-# Author:: Seth Chisamore <schisamo@getchef.com>
+# Author:: Seth Chisamore <schisamo@chef.io>
 #
 # Copyright 2013-2014, Chef Software, Inc.
 #

diff --git a/metadata.rb b/metadata.rb
@@ -1,6 +1,6 @@
 name             'jenkins'
 maintainer       'Chef Software, Inc.'
-maintainer_email 'releng@getchef.com'
+maintainer_email 'releng@chef.io'
 license          'Apache 2.0'
 description      'Installs and configures Jenkins CI master & slaves'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))

diff --git a/recipes/_master_war.rb b/recipes/_master_war.rb
@@ -5,7 +5,7 @@
 # Author: AJ Christensen <aj@junglist.gen.nz>
 # Author: Doug MacEachern <dougm@vmware.com>
 # Author: Fletcher Nichol <fnichol@nichol.ca>
-# Author: Seth Chisamore <schisamo@getchef.com>
+# Author: Seth Chisamore <schisamo@chef.io>
 # Author: Seth Vargo <sethvargo@gmail.com>
 #
 # Copyright 2010, VMware, Inc.

diff --git a/recipes/java.rb b/recipes/java.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: jenkins
 # Recipe:: java
 #
-# Author: Seth Vargo <sethvargo@getchef.com>
+# Author: Seth Vargo <sethvargo@chef.io>
 #
 # Copyright 2014, Chef Software, Inc.
 #

diff --git a/recipes/master.rb b/recipes/master.rb
@@ -5,7 +5,7 @@
 # Author: AJ Christensen <aj@junglist.gen.nz>
 # Author: Dough MacEachern <dougm@vmware.com>
 # Author: Fletcher Nichol <fnichol@nichol.ca>
-# Author: Seth Chisamore <schisamo@getchef.com>
+# Author: Seth Chisamore <schisamo@chef.io>
 # Author: Guilhem Lettron <guilhem.lettron@youscribe.com>
 # Author: Seth Vargo <sethvargo@gmail.com>
 #

diff --git a/test/fixtures/cookbooks/jenkins_script/recipes/execute.rb b/test/fixtures/cookbooks/jenkins_script/recipes/execute.rb
@@ -12,7 +12,7 @@
     user = hudson.model.User.get('yzl')
     user.setFullName('Yvonne Lam')
 
-    email = new hudson.tasks.Mailer.UserProperty('yzl@getchef.com')
+    email = new hudson.tasks.Mailer.UserProperty('yzl@chef.io')
     user.addProperty(email)
 
     user.save()

diff --git a/test/fixtures/cookbooks/jenkins_user/recipes/create.rb b/test/fixtures/cookbooks/jenkins_user/recipes/create.rb
@@ -6,7 +6,7 @@
 # Test user creation with attributes
 jenkins_user 'schisamo' do
   full_name   'Seth Chisamore'
-  email       'schisamo@getchef.com'
+  email       'schisamo@chef.io'
   public_keys ['ssh-rsa AAAAAAA']
 end
 

diff --git a/test/integration/jenkins_script/serverspec/assert_executed_spec.rb b/test/integration/jenkins_script/serverspec/assert_executed_spec.rb
@@ -3,5 +3,5 @@
 describe jenkins_user('yzl') do
   it { should be_a_jenkins_user }
   it { should have_full_name('Yvonne Lam') }
-  it { should have_email('yzl@getchef.com') }
+  it { should have_email('yzl@chef.io') }
 end
diff --git a/test/integration/jenkins_user_create/serverspec/assert_created_spec.rb b/test/integration/jenkins_user_create/serverspec/assert_created_spec.rb
@@ -7,7 +7,7 @@
 describe jenkins_user('schisamo') do
   it { should be_a_jenkins_user }
   it { should have_full_name('Seth Chisamore') }
-  it { should have_email('schisamo@getchef.com') }
+  it { should have_email('schisamo@chef.io') }
   it { should have_public_key('ssh-rsa AAAAAAA') }
 end