summaryrefslogtreecommitdiff
path: root/omnibus
diff options
context:
space:
mode:
authorJeremiah Snapp <jeremiah@chef.io>2019-08-02 17:02:53 -0400
committerJeremiah Snapp <jeremiah@chef.io>2019-08-02 17:02:53 -0400
commit4646d72741695b30fc1d569434af32dca9d0b7bf (patch)
tree1e61841e9352af238c90333db007a4e09eb1d96b /omnibus
parent3284e9067aacbe42f96afc78b06e523b46b98d2f (diff)
downloadchef-4646d72741695b30fc1d569434af32dca9d0b7bf.tar.gz
Add artifactory to omnibus/Gemfile and update omnibus gem
A new version of omnibus is required and the artifactory gem is required for the publish part of the build stage. Signed-off-by: Jeremiah Snapp <jeremiah@chef.io>
Diffstat (limited to 'omnibus')
-rw-r--r--omnibus/Gemfile1
-rw-r--r--omnibus/Gemfile.lock10
2 files changed, 7 insertions, 4 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index f2d9c0fa29..6fca425e62 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -2,6 +2,7 @@ source "https://rubygems.org"
gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master"
gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master"
+gem "artifactory"
gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 6f78854df7..e8460b670f 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: 0077920a97ab9e5550f3c3767825f9c1f805bdce
+ revision: 33bddeefb10afe23a57ea72807625881ab01990f
branch: master
specs:
- omnibus (6.0.31)
+ omnibus (6.1.0)
aws-sdk-s3 (~> 1)
chef-sugar (>= 3.3)
cleanroom (~> 1.0)
@@ -30,10 +30,11 @@ GEM
specs:
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
+ artifactory (3.0.5)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
- aws-partitions (1.194.0)
- aws-sdk-core (3.61.2)
+ aws-partitions (1.196.0)
+ aws-sdk-core (3.62.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.1)
@@ -371,6 +372,7 @@ PLATFORMS
x86-mingw32
DEPENDENCIES
+ artifactory
berkshelf (>= 7.0)
kitchen-vagrant (>= 1.3.1)
ohai