Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for recent product changes #255

Merged
merged 3 commits into from
May 10, 2018
Merged

Updates for recent product changes #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e864ae6
Updates for recent product changes
schisamo May 2, 2018
121fedc
Disable acceptance testing
schisamo May 10, 2018
891844f
Use an older version of ChefStyle which has Ruby 1.9 compat
schisamo May 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .expeditor/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ slack:
notify_channel: releng-notify

github:
delete_branch_on_merge: true
version_tag_format: v{{version}}
minor_bump_labels:
- "Version: Bump Minor"
Expand Down
34 changes: 13 additions & 21 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,20 @@ matrix:
- rvm: 2.0
- rvm: 2.2
- rvm: 2.3
env: SUITE=ubuntu
- rvm: 2.3
env: SUITE=windows-server
- rvm: 2.3
env: SUITE=centos
- rvm: 2.4
- rvm: 2.5.1
# - rvm: 2.3
# env: SUITE=ubuntu
# - rvm: 2.3
# env: SUITE=windows-server
# - rvm: 2.3
# env: SUITE=centos

before_script:
- ci/before-script.sh
# put terraform on PATH
- export PATH="$PWD/bin:$PATH"
# before_script:
# - ci/before-script.sh
# # put terraform on PATH
# - export PATH="$PWD/bin:$PATH"

script:
- bundle exec rake travis:ci
- ci/run-acceptance-tests.sh

env:
global:
# access key id
- secure: "b/O77C/ebnrXw/xSTRMcAuhmUz9QH//jfh3XSQrZF2lRJZJbAbfL3L3SPLqQmPkMDJWCAJrs82umQJkZ0RJtSqX5ZzPUqdf2v5O4CyrfMqhQbsEA9GGUlBNaQmSWUHvOCPQZzI5GWMxgQb9Bhl4+ZekUoTgNZBjvh9uAHWuT1c1fNt5pHDYMXg4wyEnyF8tzLRVD5eTJwkKd+BodM1BUvdOITYv2xl6hlg7ZoJbo+onIVc8sRTnEjGiuprhaVyMSeTNSzxa/3jDxeX+HnJ/2HwpenIBXoSskZZViZHMd1Vy2sDUfYPfDjqwr389b8SInCehe1cCD8ouAr/7614IXxwoWSMjrVgkboB+KteRZyz0qVoqCpdS6NX0YBmu5I8T6jHr3OXVwVbcK03FrFhnS2Hg+oLhKLPKMvIFQ5347DEZ1LBv0ol//ltjk/cZX11yLiF2TrrDzSca3jb7kN/LJZ2AbGQdLJnqEhBm4NznHlPYfibLum0QwNXR/lZ47OJjBQnKc9nlN+iEOKbhby6/SCnW30xWJoMfNIULmW79heaNip16wDV0DBu44mmbKcFA6KMrNFex2+QpZGmNwbWJrwnvaJqVc6FNpRtNdShQ/81vJpn5Z6KKz676EHsM6LcXha1WnNj3eLYipWIg+4OSSmHJgRiuNC4JsgsYCaBfrDw8="
# secret access key
- secure: "Ut5ARdSnWiFVAtRZ7U+CPgihi59J/KgsMFXunJjBCYyfwaDxrIsAbjddhP3lu2d/xLtvQ26SodhnMh6VMfgBFljY1s4lgjlZU2xU5RCpXFsEhUzHjryVTEgEWYgWkGrTfvalB9gnrsRxiyOh6ZvlW7QoPED+j75FSGwj6rjGCYf/7oUa3Qlt2Pymma5ijjvemgcIEKngO7Dnh3dpFR/J4S0AZdZG6HtJvYpQ2gdvH5faFjYlKHp8W/PMuOuxq2w8Pcjw009VgOjLoFAFYhFWX3hGd0b+N1xBHJDlqaBk2UCCqaKtYrhAsgQNkFiPMmNdDUtscjKx81A8fBUJOUhUxWBFhL3QM2ymuZziPQcnikpi6EPRHRyv3P6MOSyEB2DPpzFq/tEniTBW6o9QL6dHYOaPm/CBtUJ36gEvrSEJQZyhxUTQdamjWIMOTcq1/uwjp0T28rdth0o4BoGALkNQxjaV9iPHBCNtZgPdLoG9v/5CyGwlRQaY6JSVxBHdRcD9+BfwLT84K+68NPo7xXBBar0B1kBOLExI3EHLTxaspkicM2DINicUZk+SNFdInuiByv9NT7sWWbISnk6EagxPxu8D2p1zcMh6cJ8DfFz0rws+ndGiPwInjoslSV7N8Ndi4j9nTKtv9qAImJlthzPDbHY8ghz0TrXWdtwzPet7j2s="
# region
- secure: "AJSnI8RyC2NKc91+NFerdZibfCCOZ/nfm0SoSCobYbgqB8R4ii1OqHBFaG+HAA4RnxwOoMm/C+lxRkdK6GcztJSzjOx4bTJE8FfFQ1i+LvLRTuQRL1v9iLfJN0O5iJszq4ecm3jSsFYGpCh1z9OCJEnqaEya9ZNfY7U4wpCy4DG6oIUCxKRtXRUaBOqli+6SqeR/CJxp4ws7lzIu5gSWwuWoqTijO3iR3xLT0EIOkguaTfXD3lTzPhfGvV4LMd/Z/cHqxbVnLEpDCaOwiurHQOGvN9RU3vpOhH0d518QqWw0dQdu3o3cAf6wK+TZNdKo2ooDU9JccqcPS5dPiM+doqqEC55Lxfj2l+BMUeyteZt5YdtELDDe49M7gziGSfqNc8bcWFEu5mPpl0jBd4cvp1EiJNlqNK10HAr/jiI/QGSTX0FK+kpWo56E1uWbgxrLZWAnN7g7sE8y80SLE2AlGlb/MzvpNRoJcGjxltxpznbQJ5Q9EUm3vbzCgOMX0BAgeHciwX6CSTrWIciUmbRrXfZ/9NPLrNph6qQ5I3uJ77CvK3pzpUqEt9L0HJ+Wh6ZBxwFsiddtBFNE0lqV6/FkU9ws1ovF5o9jOTE7mzq4ve6GAtqCnIxmHDq/plw0idbmzuHnsehgLD1ZksYl2WIXsWWOApLIH1U+YzGNyGnLqhk="
# windows admin password
- secure: "lxe9NYpwV19g2mBa7aQoJX372hktSSn/g5oU1GDWYpi59YwpbYXP/Al/XXwq1ZfNzN+BlXw3tJPlVaEkfSQBi0AaWLJ6Kw5+a4tkIkwMyMPJQh+pKnADZK2pd+Hhrr7CRtnaT6w4V2sZCIfcdlLnKmez/BMNNdBn1+WAfE+aN224JK43rXxgLe4B9CcXCsUUORh6nJbB5f60D15qYokDu7ILi0RufyfyiJulqxIsXVNKtnUXOJRXZvDOPp9Y+2ur0HmVK7aiWr6JwXtODgrrDzZiWq99eR2ErDJB1AFUVMmudUykf5SWyivhvB4RStYDIIpG8EXrIhRKP+k9o4loqQBRcRBGvEMLdyupi7TzuryzK7j2XzhJFD9Eg+50Y5By87lRfvltuAJaDkRPfwIzSbWsh0Lb7YwUXI9a+bJebsteTPSFjb1YOYvkQCV2CB5pH68QInw8Hu9o2hmUkuoNWqqvVaxDI8z3peympfFlVtvTC9eOI60Tdv+pSCyQhBN0/II8FT/fylwQsOL+i8Hez9NIRdaRkx0JEpY56NloErd4An9zpY/xCAa/6JfzMWn7eD673MRVJW0u/j5IGuRAksuUlGZTQS+qudF4ZgVJaacm6qARULaesuCNbufZYtRB0Hg+GINQrUSfYKBw6BZUk2T9ZQ2zFsnF12k0yl9Qr7I="
# - ci/run-acceptance-tests.sh
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ end

if RUBY_VERSION =~ /^2/
group :chefstyle do
gem "chefstyle"
gem "chefstyle", "~> 0.4.0"
end
end

Expand Down
1 change: 1 addition & 0 deletions PRODUCT_MATRIX.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
| Chef Backend | chef-backend |
| Chef Server | chef-server |
| Chef Server HA Provisioning for AWS | chef-server-ha-provisioning |
| Chef Workstation | chef-workstation |
| Chef Development Kit | chefdk |
| Chef Compliance | compliance |
| Delivery | delivery |
Expand Down
2 changes: 1 addition & 1 deletion acceptance/.suites/ubuntu_install_checksum/terraform/aws.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
provider "aws" {
region = "${var.aws_region}"
profile = "chef-aws"
profile = "chef-es"
}
2 changes: 1 addition & 1 deletion acceptance/.suites/windows-nano/terraform/aws.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
provider "aws" {
region = "${var.aws_region}"
profile = "chef-aws"
profile = "chef-es"
}
2 changes: 1 addition & 1 deletion acceptance/centos_install_checksum/terraform/aws.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
provider "aws" {
region = "${var.aws_region}"
profile = "chef-aws"
profile = "chef-es"
}
2 changes: 1 addition & 1 deletion acceptance/ubuntu_install_command/terraform/aws.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
provider "aws" {
region = "${var.aws_region}"
profile = "chef-aws"
profile = "chef-es"
}
2 changes: 1 addition & 1 deletion acceptance/ubuntu_install_command_once/terraform/aws.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
provider "aws" {
region = "${var.aws_region}"
profile = "chef-aws"
profile = "chef-es"
}
2 changes: 1 addition & 1 deletion acceptance/ubuntu_install_sh/terraform/aws.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
provider "aws" {
region = "${var.aws_region}"
profile = "chef-aws"
profile = "chef-es"
}
2 changes: 1 addition & 1 deletion acceptance/windows-server-2012r2-checksum/terraform/aws.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
provider "aws" {
region = "${var.aws_region}"
profile = "chef-aws"
profile = "chef-es"
}
2 changes: 1 addition & 1 deletion acceptance/windows-server-2012r2-fips/terraform/aws.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
provider "aws" {
region = "${var.aws_region}"
profile = "chef-aws"
profile = "chef-es"
}
2 changes: 1 addition & 1 deletion acceptance/windows-server-2012r2-once/terraform/aws.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
provider "aws" {
region = "${var.aws_region}"
profile = "chef-aws"
profile = "chef-es"
}
2 changes: 1 addition & 1 deletion acceptance/windows-server-2012r2-ps1/terraform/aws.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# under ~/.aws/credentials or with $AWS_SHARED_CREDENTIALS_FILE
provider "aws" {
region = "${var.aws_region}"
profile = "chef-aws"
profile = "chef-es"
}
6 changes: 6 additions & 0 deletions lib/mixlib/install/product.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,12 @@ def products_available_on_downloads_site
downloads_product_page_url :not_available
end

product "chef-workstation" do
product_name "Chef Workstation"
package_name "chef-workstation"
github_repo "chef/chef-workstation"
end

product "chefdk" do
product_name "Chef Development Kit"
package_name "chefdk"
Expand Down
1 change: 1 addition & 0 deletions spec/unit/mixlib/install/product_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
chef-backend
chef-server
chef-server-ha-provisioning
chef-workstation
chefdk
compliance
delivery
Expand Down