diff options
author | Tim Smith <tsmith@chef.io> | 2020-08-24 21:09:37 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-24 21:09:37 -0700 |
commit | 8a46c4527eb015757070156eae11869ae00f2f6b (patch) | |
tree | 7063d3cf213a5972963982c7d3463528d680ee2b /.expeditor/release.omnibus.yml | |
parent | 00f1be999ec3e72d297df0653b6f01b8cc309404 (diff) | |
parent | 437b472852e12e1334393bfe8948b3d6b7571e6c (diff) | |
download | chef-8a46c4527eb015757070156eae11869ae00f2f6b.tar.gz |
Merge branch 'master' into bug_sir
Diffstat (limited to '.expeditor/release.omnibus.yml')
-rw-r--r-- | .expeditor/release.omnibus.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml index a41ae1362c..0d8a21dd3c 100644 --- a/.expeditor/release.omnibus.yml +++ b/.expeditor/release.omnibus.yml @@ -27,6 +27,8 @@ builder-to-testers-map: - el-7-ppc64 el-7-ppc64le: - el-7-ppc64le + el-7-s390x: + - el-7-s390x el-7-x86_64: - el-7-x86_64 - el-8-x86_64 @@ -39,6 +41,8 @@ builder-to-testers-map: - mac_os_x-10.14-x86_64 - mac_os_x-10.15-x86_64 - mac_os_x-11.0-x86_64 + sles-12-s390x: + - sles-12-s390x sles-12-x86_64: - sles-12-x86_64 - sles-15-x86_64 @@ -55,8 +59,8 @@ builder-to-testers-map: - ubuntu-16.04-x86_64 - ubuntu-18.04-x86_64 - ubuntu-20.04-x86_64 -# windows-2012r2-i386: -# - windows-2012r2-i386 + windows-2012r2-i386: + - windows-2012r2-i386 windows-2012r2-x86_64: - windows-2012-x86_64 - windows-2012r2-x86_64 |