diff options
author | sean-simmons-progress <111799713+sean-simmons-progress@users.noreply.github.com> | 2023-04-20 08:01:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-20 08:01:40 -0400 |
commit | d516726f0e593493b8d1a59153acab51fb8b6d13 (patch) | |
tree | bb0473b0548f2474a4518d5b8426f3084a4508d7 | |
parent | 43899550ca1c4f9e665457bd0bbae7dc0b06c430 (diff) | |
download | chef-d516726f0e593493b8d1a59153acab51fb8b6d13.tar.gz |
Sean simmons progress/18.2 enable aix (#13702)
* enabling aix 71 for testing
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* enabling debug
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* revering this setting thats preventing the other piplines from being tested
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* revering this setting thats preventing the other piplines from being tested
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* testing aix 73
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* modifying filter here
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* unsetting x
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* adding aix 7.2 back
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* adding aix 7.2 back
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* testing 9.0.17 omnibus
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* testing 9.0.17 omnibus
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* same error as .18, reverting back to stay consistent
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* testing aix as aix 71 is the only tool with the compiler enabled
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* testing aix as aix 71 is the only tool with the compiler enabled
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* adding extended timeout for aix
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* fixing conditional
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* something didnt like my if condition
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* fixing unary operator expected
also fixed my condtional to only extend aix build timeout
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* updating omnibus buildkite platform plugin to the latest
this has the uninstall script to remove the chef-foundation from aix.
Signed-off-by: Sean Simmons <ssimmons@progress.com>
* aix 72 timed out with 2 hours, bumping to 3h
Signed-off-by: Sean Simmons <ssimmons@progress.com>
---------
Signed-off-by: Sean Simmons <ssimmons@progress.com>
-rwxr-xr-x | .buildkite/build-test-omnibus.sh | 32 | ||||
-rw-r--r-- | .buildkite/hooks/pre-command | 2 | ||||
-rw-r--r-- | .expeditor/adhoc-canary.omnibus.yml | 4 | ||||
-rw-r--r-- | .expeditor/release.omnibus.yml | 8 |
4 files changed, 25 insertions, 21 deletions
diff --git a/.buildkite/build-test-omnibus.sh b/.buildkite/build-test-omnibus.sh index b7218f4d19..a3f2fc6fa2 100755 --- a/.buildkite/build-test-omnibus.sh +++ b/.buildkite/build-test-omnibus.sh @@ -14,13 +14,13 @@ FILTER="${OMNIBUS_FILTER:=*}" container_platforms=("amazon-2:centos-7" "amazon-2-arm:amazon-2-arm" "centos-6:centos-6" "centos-7:centos-7" "centos-7-arm:centos-7-arm" "centos-8:centos-8" "centos-8-arm:centos-8-arm" "sles-15-arm:sles-15-arm" "rhel-9:rhel-9" "rhel-9-arm:rhel-9-arm" "debian-9:debian-9" "debian-10:debian-9" "debian-11:debian-9" "ubuntu-1604:ubuntu-1604" "ubuntu-1804:ubuntu-1604" "ubuntu-2004:ubuntu-1604" "ubuntu-2204:ubuntu-1604" "ubuntu-1804-arm:ubuntu-1804-arm" "ubuntu-2004-arm:ubuntu-2004-arm" "ubuntu-2204-arm:ubuntu-2204-arm" "sles-15:sles-15" "windows-2019:windows-2019") # add rest of windows platforms to tests, if not on chef-oss org -if [ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ] +if [[ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ]] then container_platforms=( "${container_platforms[@]}" "windows-2012:windows-2019" "windows-2012r2:windows-2019" "windows-2016:windows-2019" "windows-2022:windows-2019" "windows-10:windows-2019" "windows-11:windows-2019" ) fi # array of all esoteric platforms in the format test-platform:build-platform -esoteric_platforms=("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-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-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-s390x:sles-12-s390x" "sles-15-s390x:sles-12-s390x") omnibus_build_platforms=() omnibus_test_platforms=() @@ -42,7 +42,7 @@ then fi ## add esoteric platforms in chef/chef-canary -if [ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ] +if [[ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ]] then esoteric_build_platforms=() esoteric_test_platforms=() @@ -138,7 +138,7 @@ then done fi -if [ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ] && [[ ! -z "${esoteric_build_platforms:-}" ]] +if [[ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ]] && [[ ! -z "${esoteric_build_platforms:-}" ]] then for platform in ${esoteric_build_platforms[@]}; do @@ -166,7 +166,7 @@ then echo " omnibus-toolchain: \"*\"" fi echo " plugins:" - echo " - chef/omnibus#852c8f81fb6dd12ff3471a8d825ec20a1168c4c4:" + echo " - chef/omnibus#v0.2.86:" echo " build: chef" echo " chef-foundation-version: $CHEF_FOUNDATION_VERSION" echo " config: omnibus/omnibus.rb" @@ -190,7 +190,7 @@ then echo " agents:" echo " queue: omnibus-mac_os_x-12-x86_64" echo " plugins:" - echo " - chef/omnibus#v0.2.83:" + echo " - chef/omnibus#v0.2.86:" echo " config: omnibus/omnibus.rb" echo " remote-host: buildkite-omnibus-mac_os_x-12-x86_64" echo " notarize-macos-package: chef" @@ -205,13 +205,13 @@ then fi fi -if [ $BUILDKITE_PIPELINE_SLUG == "chef-chef-main-validate-release" ] +if [[ $BUILDKITE_PIPELINE_SLUG == "chef-chef-main-validate-release" ]] then echo "- wait: ~" echo "- key: create-build-record" echo " label: \":artifactory: Create Build Record\"" echo " plugins:" - echo " - chef/omnibus#v0.2.83:" + echo " - chef/omnibus#v0.2.86:" echo " create-build-record: chef" fi @@ -258,7 +258,7 @@ then echo " automatic:" echo " limit: 1" echo " agents:" - if [ $BUILDKITE_ORGANIZATION_SLUG == "chef-oss" ] + if [[ $BUILDKITE_ORGANIZATION_SLUG == "chef-oss" ]] then echo " queue: default-${platform%:*}-privileged" else @@ -274,7 +274,7 @@ fi # using shell parameter expansion this checks to make sure the esoteric_test_platforms array isn't empty if OMNIBUS_FILTER is only container platforms # prevents esoteric_test_platforms unbound variable error -if [ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ] && [[ ! -z "${esoteric_test_platforms:-}" ]] +if [[ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ]] && [[ ! -z "${esoteric_test_platforms:-}" ]] then for platform in ${esoteric_test_platforms[@]}; do @@ -293,7 +293,11 @@ then echo " retry:" echo " automatic:" echo " limit: 1" - echo " timeout_in_minutes: 90" + if [[ $platform == *"aix"* ]]; then + echo " timeout_in_minutes: 180" + else + echo " timeout_in_minutes: 90" + fi echo " agents:" echo " queue: omnibus-${platform%:*}" if [ $build_key == "mac_os_x-10_15-x86_64" ] || [ $build_key == "mac_os_x-11-arm64" ] @@ -302,7 +306,7 @@ then echo " omnibus-toolchain: \"*\"" fi echo " plugins:" - echo " - chef/omnibus#v0.2.83:" + echo " - chef/omnibus#v0.2.86:" echo " test: chef" echo " test-path: omnibus/omnibus-test.sh" echo " install-dir: \"/opt/chef\"" @@ -322,12 +326,12 @@ then done fi -if [ $BUILDKITE_PIPELINE_SLUG == "chef-chef-main-validate-release" ] +if [[ $BUILDKITE_PIPELINE_SLUG == "chef-chef-main-validate-release" ]] then echo "- wait: ~" echo "- key: promote" echo " label: \":artifactory: Promote to Current\"" echo " plugins:" - echo " - chef/omnibus#v0.2.83:" + echo " - chef/omnibus#v0.2.86:" echo " promote: chef" fi diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index 81d1513c45..2ece1c931a 100644 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -3,7 +3,7 @@ set -eu # Only execute in the verify pipeline -[[ "$BUILDKITE_PIPELINE_NAME" =~ (verify|validate/(release|adhoc|canary)|habitat/build|habitat/test|docker/build|macos_universal_package)$ ]] +[[ "$BUILDKITE_PIPELINE_NAME" =~ (verify|validate/(release|adhoc|canary))$ ]] || exit 0 docker ps || true diff --git a/.expeditor/adhoc-canary.omnibus.yml b/.expeditor/adhoc-canary.omnibus.yml index 2ef219fdfa..a67eb3fe61 100644 --- a/.expeditor/adhoc-canary.omnibus.yml +++ b/.expeditor/adhoc-canary.omnibus.yml @@ -12,8 +12,8 @@ skip-artifactory-platforms: - freebsd-13-amd64 windows-64-msystem: UCRT64 builder-to-testers-map: - # aix-7.1-powerpc: - # - aix-7.1-powerpc + aix-7.1-powerpc: + - aix-7.1-powerpc # - aix-7.2-powerpc amazon-2022-aarch64: - amazon-2022-aarch64 diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml index 7d615b8ea2..3aa307e991 100644 --- a/.expeditor/release.omnibus.yml +++ b/.expeditor/release.omnibus.yml @@ -12,10 +12,10 @@ skip-artifactory-platforms: - freebsd-13-amd64 windows-64-msystem: UCRT64 builder-to-testers-map: - #aix-7.1-powerpc: - # - aix-7.1-powerpc - # - aix-7.2-powerpc - # - aix-7.3-powerpc + aix-7.1-powerpc: + - aix-7.1-powerpc + - aix-7.2-powerpc + - aix-7.3-powerpc # amazon-2022-aarch64: # - amazon-2022-aarch64 # amazon-2022-x86_64: |