From e08c7dc04d56595c5b597a858d0488bdf968b15b Mon Sep 17 00:00:00 2001 From: Nikhil Gupta <35272911+nikhil2611@users.noreply.github.com> Date: Tue, 28 Jan 2025 11:07:10 +0530 Subject: [PATCH] Habitat package for berkshelf (#54) * berkshelf as an hab package file Signed-off-by: nikhil2611 * updated the origin to core Signed-off-by: nikhil2611 * added the appbundler gem Signed-off-by: nikhil2611 * added bundle config in plan.ps1 Signed-off-by: nikhil2611 * updated plan.sh file Signed-off-by: nikhil2611 * updated origin Signed-off-by: nikhil2611 * add pipleline for build, publish, test cases Signed-off-by: Sachin * updated the plan.sh file Signed-off-by: nikhil2611 * updated the plan.ps1 file Signed-off-by: nikhil2611 * updating pipeline to run on expeditor instead of github actions Signed-off-by: nikhil2611 * updating pipeline to run on expeditor instead of github actions Signed-off-by: nikhil2611 * testing pipelines Signed-off-by: nikhil2611 * testing pipelines Signed-off-by: nikhil2611 * testing pipelines Signed-off-by: nikhil2611 * added echo Signed-off-by: nikhil2611 * testing pipeline Signed-off-by: nikhil2611 * testing pipeline Signed-off-by: nikhil2611 * testing pipeline Signed-off-by: nikhil2611 * removed extra line added for testing Signed-off-by: nikhil2611 * removed the manually created pipelines Signed-off-by: nikhil2611 * adding the pipelines Signed-off-by: nikhil2611 * adding the pipelines Signed-off-by: nikhil2611 * Bump version to 0.1.1 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Bump version to 0.1.2 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * commenting the pipelines Signed-off-by: nikhil2611 * Bump version to 0.1.3 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Bump version to 0.1.4 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * adding back the pipelines Signed-off-by: nikhil2611 * Bump version to 0.1.5 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Bump version to 0.1.6 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * empty commit Signed-off-by: nikhil2611 * Bump version to 0.1.7 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * empty commit Signed-off-by: nikhil2611 * added the promotion agents workload Signed-off-by: nikhil2611 * Bump version to 0.1.8 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * empty commit to test pipeline Signed-off-by: nikhil2611 * Bump version to 0.1.9 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Removed hab test pipeline duplicate Signed-off-by: nitin sanghi * Bump version to 0.1.10 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * updating config to fix promote Signed-off-by: nikhil2611 * Bump version to 0.1.11 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * empty commit Signed-off-by: nitin sanghi * Bump version to 0.1.12 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * Chef-18535 Removed the release branch changes and fixed pipeline (#53) * Updated the version for workstation-LTS to major version Signed-off-by: nikhil2611 * corrected the plan file Signed-off-by: nikhil2611 * updated the env from HAB_BLDR_CHANNEL to HAB_REFRESH_CHANNEL Signed-off-by: nikhil2611 * remoed the release branch changes and fixing pipeline Signed-off-by: nikhil2611 * adding back berkshelf rubygem Signed-off-by: nikhil2611 * fixing expeditor config error Signed-off-by: nikhil2611 --------- Signed-off-by: nikhil2611 * Bump version to 8.0.16 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. * not needed this workload Signed-off-by: nikhil2611 --------- Signed-off-by: nikhil2611 Signed-off-by: Sachin Signed-off-by: nitin sanghi Co-authored-by: Sachin Co-authored-by: ns Co-authored-by: Chef Expeditor Co-authored-by: nitin sanghi --- .expeditor/build.habitat.yml | 12 +++ .../buildkite/artifact.habitat.test.ps1 | 85 +++++++++++++++++ .expeditor/buildkite/artifact.habitat.test.sh | 70 ++++++++++++++ .expeditor/config.yml | 45 ++++++--- .expeditor/habitat-test.pipeline.yml | 37 ++++++++ .gitignore | 1 + CHANGELOG.md | 14 ++- Gemfile | 3 + habitat/plan.ps1 | 92 +++++++++++++++++++ habitat/plan.sh | 88 ++++++++++++++++++ habitat/tests/test.ps1 | 21 +++++ habitat/tests/test.sh | 26 ++++++ 12 files changed, 481 insertions(+), 13 deletions(-) create mode 100644 .expeditor/build.habitat.yml create mode 100644 .expeditor/buildkite/artifact.habitat.test.ps1 create mode 100755 .expeditor/buildkite/artifact.habitat.test.sh create mode 100644 .expeditor/habitat-test.pipeline.yml create mode 100644 habitat/plan.ps1 create mode 100644 habitat/plan.sh create mode 100644 habitat/tests/test.ps1 create mode 100755 habitat/tests/test.sh diff --git a/.expeditor/build.habitat.yml b/.expeditor/build.habitat.yml new file mode 100644 index 000000000..d28cae6fa --- /dev/null +++ b/.expeditor/build.habitat.yml @@ -0,0 +1,12 @@ +--- +env: + HAB_REFRESH_CHANNEL: "LTS-2024" + +origin: chef + +expeditor: + defaults: + buildkite: + retry: + automatic: + limit: 1 \ No newline at end of file diff --git a/.expeditor/buildkite/artifact.habitat.test.ps1 b/.expeditor/buildkite/artifact.habitat.test.ps1 new file mode 100644 index 000000000..edbea3a28 --- /dev/null +++ b/.expeditor/buildkite/artifact.habitat.test.ps1 @@ -0,0 +1,85 @@ +#!/usr/bin/env powershell + +#Requires -Version 5 +# https://stackoverflow.com/questions/9948517 +# TODO: Set-StrictMode -Version Latest +$PSDefaultParameterValues['*:ErrorAction']='Stop' +$ErrorActionPreference = 'Stop' +$env:HAB_ORIGIN = 'ci' +$env:CHEF_LICENSE = 'accept-no-persist' +$env:HAB_LICENSE = 'accept-no-persist' +$Plan = 'berkshelf' + +Write-Host "--- system details" +$Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture' +Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize + +Write-Host "--- Installing the version of Habitat required" + +function Stop-HabProcess { + $habProcess = Get-Process hab -ErrorAction SilentlyContinue + if ($habProcess) { + Write-Host "Stopping hab process..." + Stop-Process -Name hab -Force + } +} + +# Installing Habitat +function Install-Habitat { + Write-Host "Downloading and installing Habitat..." + Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1')) +} + +try { + hab --version +} +catch { + Set-ExecutionPolicy Bypass -Scope Process -Force + + Stop-HabProcess + + # Remove the existing hab.exe if it exists and if you have permissions + $habPath = "C:\ProgramData\Habitat\hab.exe" + if (Test-Path $habPath) { + Write-Host "Attempting to remove existing hab.exe..." + Remove-Item $habPath -Force -ErrorAction SilentlyContinue + if (Test-Path $habPath) { + Write-Host "Failed to remove hab.exe, re-running script with elevated permissions." + Start-Process powershell -Verb runAs -ArgumentList "-NoProfile -ExecutionPolicy Bypass -File `"$PSCommandPath`"" + exit + } + } + + Install-Habitat +} +finally { + Write-Host ":habicat: I think I have the version I need to build." +} + + +Write-Host "--- Generating fake origin key" +hab origin key generate $env:HAB_ORIGIN + +Write-Host "--- Building $Plan" +$project_root = "$(git rev-parse --show-toplevel)" +Set-Location $project_root + +$env:DO_CHECK=$true; hab pkg build . + +. $project_root/results/last_build.ps1 + +Write-Host "--- Installing $pkg_ident/$pkg_artifact" +hab pkg install -b $project_root/results/$pkg_artifact + +Write-Host "+++ Testing $Plan" + +Push-Location $project_root + +try { + Write-Host "Running unit tests..." + habitat/tests/test.ps1 $pkg_ident +} +finally { + # Ensure we always return to the original directory + Pop-Location +} \ No newline at end of file diff --git a/.expeditor/buildkite/artifact.habitat.test.sh b/.expeditor/buildkite/artifact.habitat.test.sh new file mode 100755 index 000000000..3a4b254b3 --- /dev/null +++ b/.expeditor/buildkite/artifact.habitat.test.sh @@ -0,0 +1,70 @@ +#!/usr/bin/env bash + +set -eo pipefail + +export HAB_ORIGIN='ci' +export PLAN='berkshelf' +export CHEF_LICENSE="accept-no-persist" +export HAB_LICENSE="accept-no-persist" + +echo "--- checking if git is installed" +if ! command -v git &> /dev/null; then + echo "Git is not installed. Installing Git..." + sudo yum install -y git +else + echo "Git is already installed." + git --version +fi + +echo "--- add an exception for this directory since detected dubious ownership in repository at /workdir" +git config --global --add safe.directory /workdir + +echo "--- git status for this workdir" +git status + +echo "--- ruby version" +ruby -v + +export project_root="$(git rev-parse --show-toplevel)" +echo "The value for project_root is: $project_root" + +export HAB_NONINTERACTIVE=true +export HAB_NOCOLORING=true +export HAB_STUDIO_SECRET_HAB_NONINTERACTIVE=true + +echo "--- system details" +uname -a + +echo "--- Installing Habitat" +id -a +curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | bash + +echo "--- :key: Generating fake origin key" +hab origin key generate "$HAB_ORIGIN" + + +echo "--- Building $PLAN" +cd "$project_root" +DO_CHECK=true hab pkg build . + +echo "--- Sourcing 'results/last_build.sh'" +if [ -f ./results/last_build.env ]; then + cat ./results/last_build.env + . ./results/last_build.env + export pkg_artifact +fi + +echo "+++ Installing ${pkg_ident:?is undefined}" +echo "++++" +echo $project_root +echo "+++" +hab pkg install -b "${project_root:?is undefined}/results/${pkg_artifact:?is undefined}" + +echo "+++ Testing $PLAN" + +PATH="$(hab pkg path ci/berkshelf)/bin:$PATH" +export PATH +echo "PATH is $PATH" + +echo "--- :mag_right: Testing $PLAN" +${project_root}/habitat/tests/test.sh "$pkg_ident" || error 'failures during test of executables' \ No newline at end of file diff --git a/.expeditor/config.yml b/.expeditor/config.yml index f75165191..d106458c3 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -1,6 +1,5 @@ # Documentation available at https://expeditor.chef.io/docs/getting-started/ --- - # Slack channel in Chef Software slack to send notifications about build failures, etc slack: notify_channel: chef-ws-notify @@ -22,14 +21,34 @@ github: - "Expeditor: Bump Version Major" release_branches: - - workstation-LTS: - version_constraint: 8* - main: - version_constraint: 8* + version_constraint: 8.* + +artifact_channels: + - unstable + - chef-dke-lts2024 changelog: rollup_header: Changes not yet released to rubygems.org +pipelines: + - verify: + description: Pull Request validation tests + public: true + - habitat/build: + env: + - HAB_NONINTERACTIVE: "true" + - HAB_NOCOLORING: "true" + - HAB_STUDIO_SECRET_HAB_NONINTERACTIVE: "true" + - habitat/test: + description: Execute tests against the habitat artifact + definition: .expeditor/habitat-test.pipeline.yml + env: + - HAB_NONINTERACTIVE: "true" + - HAB_NOCOLORING: "true" + - HAB_STUDIO_SECRET_HAB_NONINTERACTIVE: "true" + trigger: pull_request + subscriptions: # These actions are taken, in order they are specified, anytime a Pull Request is merged. - workload: pull_request_merged:{{github_repo}}:{{release_branch}}:* @@ -46,14 +65,18 @@ subscriptions: - "Expeditor: Skip All" - built_in:build_gem: only_if: built_in:bump_version + - trigger_pipeline:habitat/build: + only_if: built_in:bump_version + ignore_labels: + - "Expeditor: Skip Habitat" + - "Expeditor: Skip All" + - workload: project_promoted:{{agent_id}}:* actions: - built_in:rollover_changelog - - built_in:publish_rubygems -pipelines: - - verify: - description: Pull Request validation tests - public: true - env: - - IGNORE_CACHE: true + # Subscribe to the promotion of the unstable channel to stable(chef-dke-lts2024) + - workload: project_promoted:{{agent_id}}:unstable:* + actions: + - built_in:promote_habitat_packages + - built_in:publish_rubygems \ No newline at end of file diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml new file mode 100644 index 000000000..3f117add3 --- /dev/null +++ b/.expeditor/habitat-test.pipeline.yml @@ -0,0 +1,37 @@ +--- +expeditor: + defaults: + buildkite: + timeout_in_minutes: 30 + env: + HAB_REFRESH_CHANNEL: "LTS-2024" + retry: + automatic: + limit: 1 + +steps: + + - label: ":linux: Validate Habitat Builds of Berkshelf" + commands: + - .expeditor/buildkite/artifact.habitat.test.sh + expeditor: + executor: + docker: + image: ruby:3.1 + privileged: true + + - label: ":windows: Validate Habitat Builds of Berkshelf" + commands: + - .expeditor/buildkite/artifact.habitat.test.ps1 + expeditor: + executor: + docker: + host_os: windows + shell: ["powershell", "-Command"] + image: rubydistros/windows-2019:3.1 + user: 'NT AUTHORITY\SYSTEM' + environment: + - FORCE_FFI_YAJL=ext + - EXPIRE_CACHE=true + - CHEF_LICENSE=accept-no-persist + - CHEF_LICENSE_SERVER=http://hosted-license-service-lb-8000-606952349.us-west-2.elb.amazonaws.com:8000/ diff --git a/.gitignore b/.gitignore index 1439f4cec..fd132c08f 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ bin Gemfile.local gem_graph.png Gemfile.lock +.idea/ \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index c5ed6009f..7e1835d79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,24 @@ -## [v8.0.16](https://github.com/chef/berkshelf/tree/v8.0.16) (2025-01-03) +## [v8.0.16](https://github.com/chef/berkshelf/tree/v8.0.16) (2025-01-23) #### Merged Pull Requests -- Added the release branch [#42](https://github.com/chef/berkshelf/pull/42) ([nikhil2611](https://github.com/nikhil2611)) +- Chef-18535 Removed the release branch changes and fixed pipeline [#53](https://github.com/chef/berkshelf/pull/53) ([nikhil2611](https://github.com/nikhil2611)) ### Changes not yet released to rubygems.org #### Merged Pull Requests +- Chef-18535 Removed the release branch changes and fixed pipeline [#53](https://github.com/chef/berkshelf/pull/53) ([nikhil2611](https://github.com/nikhil2611)) +- empty commit [#52](https://github.com/chef/berkshelf/pull/52) ([sanghinitin](https://github.com/sanghinitin)) +- Updating config to fix promote to dev channel [#51](https://github.com/chef/berkshelf/pull/51) ([nikhil2611](https://github.com/nikhil2611)) +- Removed hab test pipeline duplicate [#50](https://github.com/chef/berkshelf/pull/50) ([sanghinitin](https://github.com/sanghinitin)) +- Test pipeline working with empty PR [#49](https://github.com/chef/berkshelf/pull/49) ([nikhil2611](https://github.com/nikhil2611)) +- Testing pipelines and added agents promote workload [#48](https://github.com/chef/berkshelf/pull/48) ([nikhil2611](https://github.com/nikhil2611)) +- Test pipeline with empty commit [#47](https://github.com/chef/berkshelf/pull/47) ([nikhil2611](https://github.com/nikhil2611)) +- Adding back the pipeline back [#46](https://github.com/chef/berkshelf/pull/46) ([nikhil2611](https://github.com/nikhil2611)) +- commenting the pipelines [#45](https://github.com/chef/berkshelf/pull/45) ([nikhil2611](https://github.com/nikhil2611)) +- Adding back the pipelines [#44](https://github.com/chef/berkshelf/pull/44) ([nikhil2611](https://github.com/nikhil2611)) - Added the release branch [#42](https://github.com/chef/berkshelf/pull/42) ([nikhil2611](https://github.com/nikhil2611)) - PR #11 rebase Allow users to user octokit 5.x [#35](https://github.com/chef/berkshelf/pull/35) ([tpowell-progress](https://github.com/tpowell-progress)) - Add running of tests on verify pipeline [#33](https://github.com/chef/berkshelf/pull/33) ([tpowell-progress](https://github.com/tpowell-progress)) diff --git a/Gemfile b/Gemfile index 24b9021b5..b6c2a696c 100644 --- a/Gemfile +++ b/Gemfile @@ -21,6 +21,9 @@ group :development do gem "chefstyle" end +gem "appbundler" + + instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"] # If you want to load debugging tools into the bundle exec sandbox, diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 new file mode 100644 index 000000000..0140fd590 --- /dev/null +++ b/habitat/plan.ps1 @@ -0,0 +1,92 @@ +$ErrorActionPreference = "Stop" +$PSDefaultParameterValues['*:ErrorAction']='Stop' + +$pkg_name="berkshelf" +$pkg_origin="chef" +$pkg_version=$(Get-Content "$PLAN_CONTEXT/../VERSION") +$pkg_maintainer="The Chef Maintainers " + +$pkg_deps=@( + "chef/ruby31-plus-devkit" + "core/git" +) +$pkg_bin_dirs=@("bin" + "vendor/bin") +$project_root= (Resolve-Path "$PLAN_CONTEXT/../").Path + +function pkg_version { + Get-Content "$SRC_PATH/VERSION" +} + +function Invoke-Before { + Set-PkgVersion +} + +function Invoke-SetupEnvironment { + Push-RuntimeEnv -IsPath GEM_PATH "$pkg_prefix/vendor" + + Set-RuntimeEnv APPBUNDLER_ALLOW_RVM "true" # prevent appbundler from clearing out the carefully constructed runtime GEM_PATH + Set-RuntimeEnv FORCE_FFI_YAJL "ext" + Set-RuntimeEnv LANG "en_US.UTF-8" + Set-RuntimeEnv LC_CTYPE "en_US.UTF-8" +} + +function Invoke-Build { + try { + $env:Path += ";c:\\Program Files\\Git\\bin" + Push-Location $project_root + $env:GEM_HOME = "$HAB_CACHE_SRC_PATH/$pkg_dirname/vendor" + + Write-BuildLine " ** Configuring bundler for this build environment" + bundle config --local without integration deploy maintenance + bundle config --local jobs 4 + bundle config --local retry 5 + bundle config --local silence_root_warning 1 + Write-BuildLine " ** Using bundler to retrieve the Ruby dependencies" + bundle install --without development + + gem build berkshelf.gemspec + Write-BuildLine " ** Using gem to install" + gem install berkshelf-*.gem --no-document + + If ($lastexitcode -ne 0) { Exit $lastexitcode } + } finally { + Pop-Location + } +} + +function Invoke-Install { + Write-BuildLine "** Copy built & cached gems to install directory" + Copy-Item -Path "$HAB_CACHE_SRC_PATH/$pkg_dirname/*" -Destination $pkg_prefix -Recurse -Force -Exclude @("gem_make.out", "mkmf.log", "Makefile", + "*/latest", "latest", + "*/JSON-Schema-Test-Suite", "JSON-Schema-Test-Suite") + + try { + Push-Location $pkg_prefix + bundle config --local gemfile $project_root/Gemfile + Write-BuildLine "** generating binstubs for berkshelf with precise version pins" + Write-BuildLine "** generating binstubs for berkshelf with precise version pins $project_root $pkg_prefix/bin " + Invoke-Expression -Command "appbundler.bat $project_root $pkg_prefix/bin berkshelf" + If ($lastexitcode -ne 0) { Exit $lastexitcode } + Write-BuildLine " ** Running the berkshelf project's 'rake install' to install the path-based gems so they look like any other installed gem." + + If ($lastexitcode -ne 0) { Exit $lastexitcode } + } finally { + Pop-Location + } +} + +function Invoke-After { + # We don't need the cache of downloaded .gem files ... + Remove-Item $pkg_prefix/vendor/cache -Recurse -Force + # We don't need the gem docs. + Remove-Item $pkg_prefix/vendor/doc -Recurse -Force + # We don't need to ship the test suites for every gem dependency, + # only inspec's for package verification. + Get-ChildItem $pkg_prefix/vendor/gems -Filter "spec" -Directory -Recurse -Depth 1 ` + | Where-Object -FilterScript { $_.FullName -notlike "*berkshelf*" } ` + | Remove-Item -Recurse -Force + # Remove the byproducts of compiling gems with extensions + Get-ChildItem $pkg_prefix/vendor/gems -Include @("gem_make.out", "mkmf.log", "Makefile") -File -Recurse ` + | Remove-Item -Force +} \ No newline at end of file diff --git a/habitat/plan.sh b/habitat/plan.sh new file mode 100644 index 000000000..51fddb4c0 --- /dev/null +++ b/habitat/plan.sh @@ -0,0 +1,88 @@ +pkg_name="berkshelf" +pkg_origin="chef" +ruby_pkg="core/ruby3_1" +pkg_maintainer="The Chef Maintainers " +pkg_description="Manage Chef Infra cookbooks and cookbook dependencies." +pkg_license=('Apache-2.0') +pkg_deps=(${ruby_pkg} core/coreutils) +pkg_bin_dirs=(bin) +pkg_build_deps=( + core/make + core/bash + core/gcc +) + +do_setup_environment() { + build_line 'Setting GEM_HOME="$pkg_prefix/vendor"' + export GEM_HOME="$pkg_prefix/vendor" + + build_line "Setting GEM_PATH=$GEM_HOME" + export GEM_PATH="$GEM_HOME" +} + +pkg_version() { + cat "$SRC_PATH/VERSION" +} + +do_before() { + update_pkg_version +} + +do_unpack() { + mkdir -pv "$HAB_CACHE_SRC_PATH/$pkg_dirname" + cp -RT "$PLAN_CONTEXT"/.. "$HAB_CACHE_SRC_PATH/$pkg_dirname/" +} + +do_build() { + + export GEM_HOME="$pkg_prefix/vendor" + + build_line "Setting GEM_PATH=$GEM_HOME" + export GEM_PATH="$GEM_HOME" + bundle config --local without integration deploy maintenance + bundle config --local jobs 4 + bundle config --local retry 5 + bundle config --local silence_root_warning 1 + bundle install --without development --jobs=3 --retry=3 + gem build berkshelf.gemspec +} + +do_install() { + export GEM_HOME="$pkg_prefix/vendor" + + build_line "Setting GEM_PATH=$GEM_HOME" + export GEM_PATH="$GEM_HOME" + gem install berkshelf-*.gem --no-document + wrap_ruby_berkshelf + set_runtime_env "GEM_PATH" "${pkg_prefix}/vendor" +} + +wrap_ruby_berkshelf() { + local bin="$pkg_prefix/bin/berks" + local real_bin="$GEM_HOME/gems/berkshelf-${pkg_version}/bin/berks" + wrap_bin_with_ruby "$bin" "$real_bin" +} + +wrap_bin_with_ruby() { + local bin="$1" + local real_bin="$2" + build_line "Adding wrapper $bin to $real_bin" + cat < "$bin" +#!$(pkg_path_for core/bash)/bin/bash +set -e + +# Set binary path that allows berkshelf to use non-Hab pkg binaries +export PATH="/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:\$PATH" + +# Set Ruby paths defined from 'do_setup_environment()' +export GEM_HOME="$pkg_prefix/vendor" +export GEM_PATH="$GEM_PATH" + +exec $(pkg_path_for ${ruby_pkg})/bin/ruby $real_bin \$@ +EOF + chmod -v 755 "$bin" +} + +do_strip() { + return 0 +} diff --git a/habitat/tests/test.ps1 b/habitat/tests/test.ps1 new file mode 100644 index 000000000..be2b6e579 --- /dev/null +++ b/habitat/tests/test.ps1 @@ -0,0 +1,21 @@ +param ( + [Parameter()] + [string]$PackageIdentifier = $(throw "Usage: test.ps1 [test_pkg_ident] e.g. test.ps1 ci/user-windows/1.0.0/20190812103929") +) + +Write-Host "--- :fire: Smokish test" + + +$version=hab pkg exec "${pkg_ident}" berks -v +$actual_version=[Regex]::Match($version,"([0-9]+.[0-9]+.[0-9]+)").Value +$package_version=$PackageIdentifier.split("/",4)[2] + +Write-Host "package_version $package_version actual version $actual_version" +if ($package_version -eq $actual_version) +{ + Write "Berkshelf working fine" +} +else { + Write-Error "Berkshelf version not met expected $package_version actual version $actual_version " + throw "Berkshelf windows pipeline not working for hab pkg" +} \ No newline at end of file diff --git a/habitat/tests/test.sh b/habitat/tests/test.sh new file mode 100755 index 000000000..9f0ccdcb3 --- /dev/null +++ b/habitat/tests/test.sh @@ -0,0 +1,26 @@ +set -euo pipefail + + +project_root="$(git rev-parse --show-toplevel)" +pkg_ident="$1" + +# print error message followed by usage and exit +error () { + local message="$1" + + echo -e "\nERROR: ${message}\n" >&2 + + exit 1 +} + +[[ -n "$pkg_ident" ]] || error 'no hab package identity provided' + +package_version=$(awk -F / '{print $3}' <<<"$pkg_ident") +echo $package_version + +cd "${project_root}" + +echo "--- :mag_right: Testing ${pkg_ident} executables" +actual_version=$(hab pkg exec "${pkg_ident}" berks -v | sed -E 's/.*: ([0-9]+\.[0-9]+\.[0-9]+).*/\1/') +echo $actual_version +[[ "$package_version" = "$actual_version" ]] || error "Berkshelf version is not the expected version. Expected '$package_version', got '$actual_version'"