diff options
| author | Jeremiah Snapp <jeremiah@chef.io> | 2019-08-02 17:25:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-02 17:25:00 -0400 |
| commit | d8c65dfc798f59801333f88bfdf2436787f3d3da (patch) | |
| tree | 9fbd56ae9c262f749c9172b8e213301015780bae | |
| parent | 3284e9067aacbe42f96afc78b06e523b46b98d2f (diff) | |
| parent | 56f1e78da9837533018bbccd8061f67b4811e7bd (diff) | |
| download | chef-d8c65dfc798f59801333f88bfdf2436787f3d3da.tar.gz | |
Merge pull request #8790 from chef/snappj/fix-omnibus-pipeline
[ci] Fix omnibus pipeline
| -rw-r--r-- | .expeditor/release.omnibus.yml | 18 | ||||
| -rw-r--r-- | omnibus/Gemfile | 1 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 10 |
3 files changed, 16 insertions, 13 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml index c341d2ccc2..fba2415f1b 100644 --- a/.expeditor/release.omnibus.yml +++ b/.expeditor/release.omnibus.yml @@ -12,8 +12,8 @@ builder-to-testers-map: debian-8-x86_64: - debian-8-x86_64 - debian-9-x86_64 - el-6-i386: - - el-6-i386 + el-6-i686: + - el-6-i686 el-6-s390x: - el-6-s390x el-6-x86_64: @@ -29,9 +29,9 @@ builder-to-testers-map: el-7-x86_64: - el-7-x86_64 - el-8-x86_64 - freebsd-10-x86_64: - - freebsd-10-x86_64 - - freebsd-11-x86_64 + freebsd-10-amd64: + - freebsd-10-amd64 + - freebsd-11-amd64 mac_os_x-10.12-x86_64: - mac_os_x-10.12-x86_64 - mac_os_x-10.13-x86_64 @@ -45,10 +45,10 @@ builder-to-testers-map: sles-12-x86_64: - sles-12-x86_64 - sles-15-x86_64 - solaris-11-i86pc: - - solaris-11-i86pc - solaris-11-sparc: - - solaris-11-sparc + solaris2-5.11-i386: + - solaris2-5.11-i386 + solaris2-5.11-sparc: + - solaris2-5.11-sparc ubuntu-16.04-x86_64: - ubuntu-16.04-x86_64 - ubuntu-18.04-x86_64 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 |