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.

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

TEST NEW IBM HOSTS #14284

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
26 changes: 13 additions & 13 deletions .buildkite/build-test-omnibus.sh
Expand Up @@ -20,7 +20,7 @@ then
fi

# array of all esoteric platforms in the format test-platform:build-platform
esoteric_platforms=("aix-7.1-powerpc:aix-7.1-powerpc" "aix-7.2-powerpc:aix-7.1-powerpc" "aix-7.3-powerpc:aix-7.1-powerpc" "el-7-ppc64:el-7-ppc64" "el-7-ppc64le:el-7-ppc64le" "el-7-s390x:el-7-s390x" "el-8-s390x:el-7-s390x" "freebsd-12-amd64:freebsd-12-amd64" "freebsd-13-amd64:freebsd-12-amd64" "mac_os_x-10.15-x86_64:mac_os_x-10.15-x86_64" "mac_os_x-11-x86_64:mac_os_x-10.15-x86_64" "mac_os_x-12-x86_64:mac_os_x-10.15-x86_64" "mac_os_x-11-arm64:mac_os_x-11-arm64" "mac_os_x-12-arm64:mac_os_x-11-arm64" "solaris2-5.11-i386:solaris2-5.11-i386" "solaris2-5.11-sparc:solaris2-5.11-sparc" "sles-12-x86_64:sles-12-x86_64" "sles-12-s390x:sles-12-s390x" "sles-15-s390x:sles-12-s390x")
esoteric_platforms=("aix-7.1-powerpc:aix-7.1-powerpc" "aix-7.2-powerpc:aix-7.1-powerpc" "aix-7.3-powerpc:aix-7.1-powerpc" "el-7-ppc64:el-7-ppc64" "el-7-ppc64le:el-7-ppc64le" "el-7-s390x:el-7-s390x" "el-8-s390x:el-7-s390x" "freebsd-12-amd64:freebsd-12-amd64" "freebsd-13-amd64:freebsd-12-amd64" "mac_os_x-11-x86_64:mac_os_x-11-x86_64" "mac_os_x-12-x86_64:mac_os_x-11-x86_64" "mac_os_x-11-arm64:mac_os_x-11-arm64" "mac_os_x-12-arm64:mac_os_x-11-arm64" "solaris2-5.11-i386:solaris2-5.11-i386" "solaris2-5.11-sparc:solaris2-5.11-sparc" "sles-12-x86_64:sles-12-x86_64" "sles-12-s390x:sles-12-s390x" "sles-15-s390x:sles-12-s390x")

omnibus_build_platforms=()
omnibus_test_platforms=()
Expand Down Expand Up @@ -167,16 +167,16 @@ then
echo " chef-foundation-version: $CHEF_FOUNDATION_VERSION"
echo " config: omnibus/omnibus.rb"
echo " install-dir: \"/opt/chef\""
if [ $build_key == "mac_os_x-10_15-x86_64" ]
if [ $build_key == "mac_os_x-11-x86_64" ]
then
echo " remote-host: buildkite-omnibus-$platform"
fi
echo " omnibus-pipeline-definition-path: \".expeditor/release.omnibus.yml\""
if [ $build_key == "mac_os_x-11-arm64" ]
then
echo " concurrency: 1"
echo " concurrency_group: omnibus-$build_key/build/chef"
fi
# if [ $build_key == "mac_os_x-11-arm64" ]
# then
# echo " concurrency: 2"
# echo " concurrency_group: omnibus-$build_key/build/chef"
# fi
done

if [[ " ${esoteric_build_platforms[*]} " =~ "mac_os_x" ]]
Expand Down Expand Up @@ -296,7 +296,7 @@ then
fi
echo " agents:"
echo " queue: omnibus-${platform%:*}"
if [ $build_key == "mac_os_x-10_15-x86_64" ] || [ $build_key == "mac_os_x-11-arm64" ]
if [ $build_key == "mac_os_x-11-x86_64" ] || [ $build_key == "mac_os_x-11-arm64" ]
then
echo " omnibus: tester"
echo " omnibus-toolchain: \"*\""
Expand All @@ -310,11 +310,11 @@ then
then
echo " remote-host: buildkite-omnibus-${platform%:*}"
fi
if [ $test_key == "mac_os_x-11-arm64" ] || [ $test_key == "mac_os_x-12-arm64" ]
then
echo " concurrency: 1"
echo " concurrency_group: omnibus-$test_key/test/chef"
fi
# if [ $test_key == "mac_os_x-11-arm64" ] || [ $test_key == "mac_os_x-12-arm64" ]
# then
# echo " concurrency: 2"
# echo " concurrency_group: omnibus-$test_key/test/chef"
# fi
if [ $test_key == "freebsd-13-amd64" ]
then
echo " soft_fail: true"
Expand Down
6 changes: 3 additions & 3 deletions omnibus/config/software/chef-local-source.rb
Expand Up @@ -75,8 +75,8 @@
# these are gems which are not shipped but which must be installed in the testers
bundle_excludes = excluded_groups + %w{development test}

bundle "install --without #{bundle_excludes.join(" ")}", env: env

bundle "config set --local without docgen chefstyle development test", env: env
bundle "install --jobs=2 "
ruby "post-bundle-install.rb", env: env

# use the rake install task to build/install chef-config/chef-utils
Expand Down Expand Up @@ -124,4 +124,4 @@
remove_directory "#{gem_install_dir}/test"
end
end
end
end