Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

WIP Lbaker/azure-ssl #207

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
6437603
Add sql_connection_user attribute to permit a different username to b…
zanecodes Feb 26, 2019
21e1afb
Replace uses of sql_user and db_superuser for establishing PostgreSQL…
zanecodes Feb 26, 2019
648bb23
Bump opscode-pushy-server cookbook version
zanecodes Feb 26, 2019
6de2b50
Add attribute to allow SSL connections to PostgreSQL
zanecodes Feb 26, 2019
1d6093e
Pass PostgreSQL ssl attribute to service config template
zanecodes Feb 26, 2019
d8e0c93
Inherit sslmode attribute from Chef server settings
zanecodes Feb 26, 2019
32153c1
Fix sqitch and ec_postgres to respect sslmode attribute
zanecodes Feb 26, 2019
be82ab0
Add sslmode property to pg_sqitch resource
zanecodes Mar 4, 2019
1f640d2
Explicitly define expeditor promote config
jeremiahsnapp Mar 1, 2019
af775eb
Migrate verification tests to Buildkite
Apr 2, 2019
3158e9d
Fix syntax for updated db and sqitch
Apr 2, 2019
4e4d599
Bump version to 2.2.12 by Chef Expeditor
chef-ci Apr 3, 2019
c69b565
Update gem versions
Mar 19, 2019
c46a986
Update cookbooks
markan Apr 2, 2019
0b14f56
Update required version of chef server
markan Apr 2, 2019
3d5c0f5
Remove deps that require wxwindows
markan Apr 2, 2019
6314009
Don't pull a value from the env and the state
markan Mar 27, 2019
92ad4fd
Bump version to 2.2.13 by Chef Expeditor
chef-ci Apr 9, 2019
16fe382
Update chef, ohai and rubygems
Apr 16, 2019
43e8750
Use python2 for verification tests
Apr 17, 2019
2f8cec3
Bump version to 2.2.14 by Chef Expeditor
chef-ci Apr 18, 2019
9fdd813
Update the omnibus build license to the Chef EULA
btm May 8, 2019
4985ccc
Convert Chef EULA to a local file
btm May 8, 2019
32fcfda
Bump version to 2.2.15 by Chef Expeditor
chef-ci May 14, 2019
05d95ff
Bump version to v3 for Chef EULA major release
btm May 14, 2019
2777979
Update CHANGELOG.md with details from pull request #199
chef-ci May 14, 2019
8d79d37
Use new omnibus-toolchain scripts in omnibus-test.sh
jeremiahsnapp Jun 20, 2019
23c14ed
Deprecate Ubuntu-14.04
Jul 5, 2019
5932755
Accept license for tests
Jul 5, 2019
c6d0d81
Resolve test failures removing backend_secondary
Jul 5, 2019
9ae6335
Add OSS Practices
markan Jun 6, 2019
3c5990a
Bump version to 3.0.1 by Chef Expeditor
chef-ci Jul 25, 2019
3b521c2
Add artifactory to omnibus/Gemfile and update omnibus gem
jeremiahsnapp Aug 2, 2019
ae3a443
Bump version to 3.0.2 by Chef Expeditor
chef-ci Aug 22, 2019
dff398f
Update omnibus + omnibus-software
snapp Aug 22, 2019
f97b660
Add RHEL 8 Tester
snapp Aug 22, 2019
6fe4bbc
Bump version to 3.0.3 by Chef Expeditor
chef-ci Aug 27, 2019
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
9 changes: 9 additions & 0 deletions .expeditor/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ github:
- "Expeditor: Bump Minor Version"

pipelines:
- verify
- omnibus/release
- omnibus/adhoc:
definition: .expeditor/release.omnibus.yml
Expand All @@ -45,3 +46,11 @@ subscriptions:
actions:
- built_in:rollover_changelog
- built_in:notify_chefio_slack_channels

promote:
actions:
- built_in:promote_artifactory_artifact
channels:
- unstable
- current
- stable
4 changes: 2 additions & 2 deletions .expeditor/release.omnibus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ builder-to-testers-map:
- el-6-x86_64
el-7-x86_64:
- el-7-x86_64
ubuntu-14.04-x86_64:
- ubuntu-14.04-x86_64
- el-8-x86_64
ubuntu-16.04-x86_64:
- ubuntu-16.04-x86_64
- ubuntu-18.04-x86_64
17 changes: 17 additions & 0 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
steps:

- label: push-server-test
command:
- /workdir/scripts/bk_tests/bk_install.sh
- cd /workdir/pushy-server-schema && make setup_schema setup_tests
- cd /workdir; make && make test
expeditor:
executor:
docker:
image: "chefes/a1-buildkite"
environment:
- PATH=~/perl5/bin:/opt/asdf/shims:/opt/asdf/bin:/opt/ci-studio-common/bin:/go/bin:/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/chefdk/bin:/opt/asdf/installs/ruby/2.5.5/bin
- PERL5LIB=~/perl5/lib/perl5/x86_64-linux-gnu-thread-multi:~/perl5/lib/perl5:/etc/perl:/usr/local/lib/perl/5.14.2:/usr/local/share/perl/5.14.2:/usr/lib/perl5:/usr/share/perl5:/usr/lib/perl/5.14:/usr/share/perl/5.14:/usr/local/lib/site_perl
- LD_LIBRARY_PATH=/workdir/_build/default/lib/erlzmq/deps/local/lib
- ERLANG_VERSION=18.3
14 changes: 11 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
# Push Jobs Server Changelog
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
<!-- latest_release 2.2.11 -->
## [2.2.11](https://github.com/chef/opscode-pushy-server/tree/2.2.11) (2018-11-13)
<!-- latest_release 3.0.3 -->
## [3.0.3](https://github.com/chef/opscode-pushy-server/tree/3.0.3) (2019-08-27)

#### Merged Pull Requests
- Add github issue templates [#182](https://github.com/chef/opscode-pushy-server/pull/182) ([markan](https://github.com/markan))
- Add RHEL 8 tester to build pipeline [#205](https://github.com/chef/opscode-pushy-server/pull/205) ([christopher-snapp](https://github.com/christopher-snapp))
<!-- latest_release -->

<!-- release_rollup since=2.2.8 -->
### Changes since 2.2.8 release

#### Merged Pull Requests
- Add RHEL 8 tester to build pipeline [#205](https://github.com/chef/opscode-pushy-server/pull/205) ([christopher-snapp](https://github.com/christopher-snapp)) <!-- 3.0.3 -->
- Jsinha/deprecate ubuntu 14 [#203](https://github.com/chef/opscode-pushy-server/pull/203) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 3.0.2 -->
- Ma/oss practices [#201](https://github.com/chef/opscode-pushy-server/pull/201) ([markan](https://github.com/markan)) <!-- 3.0.1 -->
- Bump version to v3 for Chef EULA major release [#199](https://github.com/chef/opscode-pushy-server/pull/199) ([btm](https://github.com/btm)) <!-- 3.0.0 -->
- Update the omnibus build license to the Chef EULA [#198](https://github.com/chef/opscode-pushy-server/pull/198) ([btm](https://github.com/btm)) <!-- 2.2.15 -->
- Update chef, ohai and rubygems [#197](https://github.com/chef/opscode-pushy-server/pull/197) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 2.2.14 -->
- Jsinha/just try [#195](https://github.com/chef/opscode-pushy-server/pull/195) ([markan](https://github.com/markan)) <!-- 2.2.13 -->
- Migrate verification tests to Buildkite [#196](https://github.com/chef/opscode-pushy-server/pull/196) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 2.2.12 -->
- Add github issue templates [#182](https://github.com/chef/opscode-pushy-server/pull/182) ([markan](https://github.com/markan)) <!-- 2.2.11 -->
- MSYS-832 : Added Max_body_size configurable [#180](https://github.com/chef/opscode-pushy-server/pull/180) ([piyushawasthi](https://github.com/piyushawasthi)) <!-- 2.2.10 -->
- Amol/795 chef upgrade [#179](https://github.com/chef/opscode-pushy-server/pull/179) ([samshinde](https://github.com/samshinde)) <!-- 2.2.9 -->
Expand Down
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# Chef Push Jobs Server

[![Build Status](https://badge.buildkite.com/273e4d7ab2cfc46f02e29460dfb5529f868a802b34500e6d67.svg)](https://buildkite.com/chef/chef-opscode-pushy-server-master-omnibus-adhoc)

**Umbrella Project**: [Chef Infra](https://github.com/chef/chef-oss-practices/blob/master/projects/chef-server-infra.md)

**Project State**: [Active](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md#Maintained)

**Issues [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md)**: 28 days

**Pull Request [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md)**: 28 days

NOTE: we know we have a backlog, and are working through it, but this applies for new requests.

This repository is the central repository for the Chef Push Jobs Server.

If you want to file an issue about Chef Push Jobs Server or contribute a change, you're in the right place.

If you need to file an issue against another Chef project, you can find a list of projects and where to file issues in the [community contributions section](https://docs.chef.io/community_contributions.html#issues-and-bug-reports) of the [Chef docs](https://docs.chef.io).

## Getting Help

We use GitHub issues to track bugs and feature requests. If you need help please post to our Mailing List or join the Chef Community Slack.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.11
3.0.3
1 change: 0 additions & 1 deletion apps/pushy/include/pushy_wm.hrl
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
pushy_job :: tuple(),
incarnation_id :: binary(),
requestor :: binary(),
max_body_size :: binary(),

%% Authz ID of the requestor
%% TODO: Why isn't this just an embedded #pushy_principal{} record instead?
Expand Down
1 change: 0 additions & 1 deletion apps/pushy/src/pushy_config_resource.erl
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ to_json(Req, #config_state{organization_name = OrgName,
node_name = NodeName,
incarnation_id = IncarnationId,
curve_public_key = CurvePublicKey,
max_body_size = MaxBodySize,
requestor_key = ClientKey } = State) ->
Host = envy:get(pushy, server_name, string),
ConfigLifetime = envy:get(pushy, config_lifetime, ?DEFAULT_CONFIG_LIFETIME, integer),
Expand Down
2 changes: 1 addition & 1 deletion oc-pushy-pedant/Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source "https://rubygems.org"

# Pinned to the same version shipped in the current pushy client
gem "chef", "14.1.12"
gem "chef", "14.11.21"
gem "ohai", "~> 14.0"
gem "rake"

Expand Down
131 changes: 65 additions & 66 deletions oc-pushy-pedant/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GIT
remote: git://github.com/opscode/rest-client
remote: git://github.com/opscode/rest-client.git
revision: ba0d12258b77791d8f7d9776d008eb6fa3580ccc
specs:
rest-client (1.7.0.alpha)
Expand All @@ -8,8 +8,8 @@ GIT
rdoc (>= 2.4.2)

GIT
remote: https://github.com/chef/chef-server
revision: f04d6512a89960efb9c7db4727f03f86156acc8c
remote: https://github.com/chef/chef-server.git
revision: 6d99a45f4e510423e9b4e7a3dde7410c503a80f2
specs:
oc-chef-pedant (2.2.0)
activesupport (>= 4.2.7.1, < 6.0)
Expand All @@ -22,15 +22,16 @@ GIT
rspec (~> 3.2)
rspec-rerun (~> 1.0)
rspec_junit_formatter (~> 0.2)
uuidtools (~> 2.0)

GIT
remote: https://github.com/chef/opscode-pushy-client.git
revision: dca28f6d5630ac9b2eb4a4026023031a216277ea
revision: 990f49be0947fbf86b2f6b0bf528af22bd3b8d74
specs:
opscode-pushy-client (2.5.0)
chef (>= 12.19, < 15.0)
opscode-pushy-client (2.5.11)
chef (>= 13.0, < 16.0)
ffi-rzmq
ohai (>= 8.23, < 15.0)
ohai (>= 13.0, < 16.0)
uuidtools

PATH
Expand All @@ -42,31 +43,30 @@ PATH
GEM
remote: https://rubygems.org/
specs:
activesupport (5.2.0)
activesupport (5.2.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
builder (3.2.3)
chef (14.1.12)
chef (14.11.21)
addressable
bundler (>= 1.10)
chef-config (= 14.1.12)
chef-config (= 14.11.21)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
ffi (< 1.9.22)
ffi (~> 1.9, >= 1.9.25)
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
iso8601 (~> 0.9.1)
mixlib-archive (~> 0.4)
mixlib-authentication (~> 2.0)
mixlib-archive (>= 0.4, < 2.0)
mixlib-authentication (~> 2.1)
mixlib-cli (~> 1.7)
mixlib-log (~> 2.0, >= 2.0.3)
mixlib-shellout (~> 2.0)
mixlib-shellout (~> 2.4)
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (~> 4.2)
net-ssh-multi (~> 1.2, >= 1.2.1)
Expand All @@ -81,54 +81,53 @@ GEM
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
chef-config (14.1.12)
chef-config (14.11.21)
addressable
fuzzyurl
mixlib-config (~> 2.0)
mixlib-config (>= 2.2.12, < 3.0)
mixlib-shellout (~> 2.0)
tomlrb (~> 1.2)
chef-zero (14.0.6)
chef-zero (14.0.12)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
mixlib-log (~> 2.0)
rack (~> 2.0)
mixlib-log (>= 2.0, < 4.0)
rack (~> 2.0, >= 2.0.6)
uuidtools (~> 2.1)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.5)
diff-lcs (1.3)
erubis (2.7.0)
ffi (1.9.21)
ffi-rzmq (2.0.6)
ffi-rzmq-core (>= 1.0.6)
ffi-rzmq-core (1.0.6)
ffi (1.10.0)
ffi-rzmq (2.0.7)
ffi-rzmq-core (>= 1.0.7)
ffi-rzmq-core (1.0.7)
ffi
ffi-yajl (2.3.1)
libyajl2 (~> 1.2)
fuzzyurl (0.9.0)
hashie (3.5.7)
hashie (3.6.0)
highline (1.7.10)
httpclient (2.8.3)
i18n (1.0.1)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
iniparse (1.4.4)
ipaddress (0.8.3)
iso8601 (0.9.1)
libyajl2 (1.2.0)
mime-types (3.1)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mime-types-data (3.2018.0812)
minitest (5.11.3)
mixlib-archive (0.4.6)
mixlib-archive (1.0.1)
mixlib-log
mixlib-authentication (2.0.0)
mixlib-authentication (2.1.1)
mixlib-cli (1.7.0)
mixlib-config (2.2.6)
mixlib-config (2.2.18)
tomlrb
mixlib-log (2.0.4)
mixlib-shellout (2.3.2)
mixlib-log (2.0.9)
mixlib-shellout (2.4.4)
multi_json (1.13.1)
net-http-spy (0.2.1)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-scp (2.0.0)
net-ssh (>= 2.6.5, < 6.0.0)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (4.2.0)
Expand All @@ -139,42 +138,42 @@ GEM
net-ssh-gateway (>= 1.2.0)
net-telnet (0.1.1)
netrc (0.7.9)
ohai (14.1.3)
ohai (14.8.11)
chef-config (>= 12.8, < 15)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
ipaddress
mixlib-cli
mixlib-config (~> 2.0)
mixlib-log (~> 2.0, >= 2.0.1)
mixlib-shellout (~> 2.0)
mixlib-cli (>= 1.7.0)
mixlib-config (>= 2.0, < 4.0)
mixlib-log (>= 2.0.1, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
plist (~> 3.1)
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
plist (3.4.0)
plist (3.5.0)
proxifier (1.0.3)
public_suffix (3.0.2)
rack (2.0.5)
rake (12.3.1)
rdoc (6.0.4)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
public_suffix (3.0.3)
rack (2.0.6)
rake (12.3.2)
rdoc (6.1.1)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-core (3.8.0)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-support (~> 3.8.0)
rspec-its (1.2.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.7.0)
rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-support (~> 3.8.0)
rspec-rerun (1.1.0)
rspec (~> 3.0)
rspec-support (3.7.1)
rspec-support (3.8.0)
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
Expand All @@ -184,25 +183,25 @@ GEM
rspec-its
specinfra (~> 2.72)
sfl (2.3)
specinfra (2.73.3)
specinfra (2.76.9)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
net-ssh (>= 2.7)
net-telnet (= 0.1.1)
sfl
syslog-logger (1.6.8)
systemu (2.6.5)
thread_safe (0.3.6)
tomlrb (1.2.6)
tomlrb (1.2.8)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uuidtools (2.1.5)
wmi-lite (1.0.0)
wmi-lite (1.0.2)

PLATFORMS
ruby

DEPENDENCIES
chef (= 14.1.12)
chef (= 14.11.21)
oc-chef-pedant!
oc-pushy-pedant!
ohai (~> 14.0)
Expand All @@ -211,4 +210,4 @@ DEPENDENCIES
rest-client!

BUNDLED WITH
1.16.1
1.17.3
Loading