From a536b5d78c668805ae7a0bfea2d49c6ad87c8546 Mon Sep 17 00:00:00 2001 From: nitin sanghi Date: Fri, 6 Dec 2024 15:54:26 +0530 Subject: [PATCH] Change the pipeline to expeditor Signed-off-by: nitin sanghi --- .expeditor/build.habitat.yml | 9 ++ .../buildkite/artifact.habitat.test.ps1 | 86 +++++++++++++ .expeditor/buildkite/artifact.habitat.test.sh | 70 +++++++++++ .expeditor/config.yml | 31 ++++- .expeditor/habitat-test.pipeline.yml | 36 ++++++ .github/workflows/habitat-build.yml | 117 ------------------ .github/workflows/habitat-publish.yml | 112 ----------------- 7 files changed, 231 insertions(+), 230 deletions(-) create mode 100644 .expeditor/build.habitat.yml create mode 100755 .expeditor/buildkite/artifact.habitat.test.ps1 create mode 100755 .expeditor/buildkite/artifact.habitat.test.sh create mode 100644 .expeditor/habitat-test.pipeline.yml delete mode 100644 .github/workflows/habitat-build.yml delete mode 100644 .github/workflows/habitat-publish.yml diff --git a/.expeditor/build.habitat.yml b/.expeditor/build.habitat.yml new file mode 100644 index 000000000..72ea2567a --- /dev/null +++ b/.expeditor/build.habitat.yml @@ -0,0 +1,9 @@ +--- +origin: chef + +expeditor: + defaults: + buildkite: + retry: + automatic: + limit: 1 diff --git a/.expeditor/buildkite/artifact.habitat.test.ps1 b/.expeditor/buildkite/artifact.habitat.test.ps1 new file mode 100755 index 000000000..209c4c832 --- /dev/null +++ b/.expeditor/buildkite/artifact.habitat.test.ps1 @@ -0,0 +1,86 @@ +#!/usr/bin/env powershell + +#Requires -Version 5 +# https://stackoverflow.com/questions/9948517 +# TODO: Set-StrictMode -Version Latest +$PSDefaultParameterValues['*:ErrorAction']='Stop' +$ErrorActionPreference = 'Stop' +$env:HAB_BLDR_CHANNEL = "LTS-2024" +$env:HAB_ORIGIN = 'ci' +$env:CHEF_LICENSE = 'accept-no-persist' +$env:HAB_LICENSE = 'accept-no-persist' +$Plan = 'chef-cli' + +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..fb195d1d4 --- /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='chef-cli' +export CHEF_LICENSE="accept-no-persist" +export HAB_LICENSE="accept-no-persist" +export HAB_BLDR_CHANNEL="LTS-2024" + +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/chef-cli)/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 417289fc0..e0bf063ab 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -27,6 +27,8 @@ github: release_branches: - main: version_constraint: 19.* + - workstation-LTS: + version_constraint: 19.* - 18-stable: version_constraint: 18.* - 17-stable: @@ -36,7 +38,22 @@ release_branches: changelog: rollup_header: Changes not yet released to rubygems.org - +pipelines: + - habitat/publish: + description: Create artiface and publish on BLDR + definition: .expeditor/build.habitat.yml + env: + - HAB_NONINTERACTIVE: "true" + - HAB_NOCOLORING: "true" + - HAB_STUDIO_SECRET_HAB_NONINTERACTIVE: "true" + - habitat/build-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}}:* @@ -53,8 +70,20 @@ subscriptions: - "Expeditor: Skip All" - built_in:build_gem: only_if: built_in:bump_version + - trigger_pipeline:habitat/publish: + ignore_labels: + - "Expeditor: Skip Habitat" + - "Expeditor: Skip All" + - trigger_pipeline:habitat/build-test: + ignore_labels: + - "Expeditor: Skip Habitat" + - "Expeditor: Skip All" - workload: project_promoted:{{agent_id}}:* actions: - built_in:rollover_changelog - built_in:publish_rubygems + - workload: buildkite_hab_build_group_published:{{agent_id}}:* + actions: + # when all of the hab package publish to the unstable channel, test and promote them + - trigger_pipeline:habitat/publish \ 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..a86366933 --- /dev/null +++ b/.expeditor/habitat-test.pipeline.yml @@ -0,0 +1,36 @@ +--- +expeditor: + defaults: + buildkite: + timeout_in_minutes: 30 + retry: + automatic: + limit: 1 + + +steps: + + - label: ":linux: Validate Habitat Builds of Chef-cli" + commands: + - .expeditor/buildkite/artifact.habitat.test.sh + expeditor: + executor: + docker: + image: ruby:3.1 + privileged: true + + - label: ":windows: Validate Habitat Builds of Test Kitchen" + 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/.github/workflows/habitat-build.yml b/.github/workflows/habitat-build.yml deleted file mode 100644 index 620528908..000000000 --- a/.github/workflows/habitat-build.yml +++ /dev/null @@ -1,117 +0,0 @@ -name: Build Habitat packages - -on: - push: - branches: - - workstation-LTS - pull_request: - branches: - - workstation-LTS - -env: - # BLDR URL Defined as: 'https://bldr.habitat.sh/' but as an env var in workspace settings. - BLDR_URL: ${{vars.BLDR_URL}} - # HAB_ORIGIN Defined as: 'chef' defined in workspace settings. - HAB_ORIGIN: ${{vars.HAB_ORIGIN}} - # BLDR_CHANNEL defaulted to unstable, but can be switched to stable, it is defined via the environment setting https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#using-an-environment - BLDR_CHANNEL: ${{ vars.BLDR_CHANNEL }} - # HABITAT_VERSION_SET this is the version of habitat CLI you are using, defaults to latest. - HABITAT_VERSION_SET: ${{vars.HABITAT_VERSION_SET}} - # HAB_AUTH_TOKEN your orgs/projects auth token value - HAB_AUTH_TOKEN: ${{ secrets.HAB_AUTH_TOKEN }} - # HABITAT_TARGET this is the CPU arch for the linux CLI tool, its defaulted to x86_64 - #HABITAT_TARGET: $#{{vars.HABITAT_TARGET}} - HAB_FALLBACK_CHANNEL: ${{vars.HAB_FALLBACK_CHANNEL}} - -permissions: - contents: write - -jobs: - pre-build: - name: Setup before building packages - runs-on: ubuntu-latest - outputs: - app_version: ${{ steps.app_version.outputs.APP_VERSION }} - steps: - - name: Get branch name - id: get_branch_name - run: | - echo "BRANCH_NAME=${GITHUB_REF_NAME//\//-}" >> "$GITHUB_OUTPUT" - - name: Get version from tag - id: app_version - run: | - echo "APP_VERSION=${{ github.ref_type == 'tag' && github.ref_name || format('{0}-{1}', steps.get_branch_name.outputs.BRANCH_NAME, github.sha) }}" >> "$GITHUB_OUTPUT" - agent-matrix: - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest, windows-latest] - # matrix strategy is described at https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs - - runs-on: ${{ matrix.os }} - # free runner types are https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners - # from macos-latest, windows-latest, ubuntu-latest, ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, windows-2016 - # included software packages on runners are at https://github.com/actions/runner-images#available-images - # defaulted to unstable, but can be switched to stable, it is defined via the environment setting https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#using-an-environment - # environment: unstable - steps: - - name: print OS - run: echo "--- ${{ matrix.os }}" - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - - name: install habitat on Linux - if: ${{ matrix.os == 'ubuntu-latest' }} - shell: bash - run: | - echo "--- STARTING HAB INSTALL ON ${{ matrix.os }} UBUNTU with habitat version:${{vars.HABITAT_VERSION_SET}}" - export HABITAT_VERSION="${{vars.HABITAT_VERSION_SET}}" - export HAB_FALLBACK_CHANNEL="${{vars.HAB_FALLBACK_CHANNEL}}" - HABITAT_VERSION="${HABITAT_VERSION:?HABITAT_VERSION must be set}" - HABITAT_TARGET="${HABITAT_TARGET:-x86_64-linux}" - curl https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh | sudo bash -s -- -v "$HABITAT_VERSION" -t "$HABITAT_TARGET" - - name: run Habitat packaging (linux) - if: ${{ matrix.os == 'ubuntu-latest' }} - shell: bash - run: | - hab license accept - hab origin key download $HAB_ORIGIN - hab origin key download --auth $HAB_AUTH_TOKEN --secret $HAB_ORIGIN - echo "--- running linux hab build" - hab pkg build . - hartfile=$(ls ./results | grep "ohai" | tail -n 1) - sudo hab license accept - export CHEF_LICENSE="accept-no-persist" - export HAB_LICENSE="accept-no-persist" - export HAB_NONINTERACTIVE="true" - sudo hab pkg install ./results/$hartfile - . ./results/last_build.env - export pkg_ident - chmod +x habitat/tests/test.sh - habitat/tests/test.sh - - name: Install Habitat on Windows - if: ${{ matrix.os == 'windows-latest' }} - shell: pwsh - run: | - write-output "--- STARTING HAB INSTALL ON ${{ matrix.os }} WINDOWS with habitat version:${{vars.HABITAT_VERSION_SET}}" - $env:HAB_LICENSE = "accept-no-persist" - $env:HAB_NONINTERACTIVE = "true" - $env:HAB_FALLBACK_CHANNEL= "${{vars.HAB_FALLBACK_CHANNEL}}" - Invoke-Expression "& { $(Invoke-RestMethod https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1) } -Version ${{vars.HABITAT_VERSION_SET}}" - - name: run habitat packaging windows - if: ${{ matrix.os == 'windows-latest' }} - shell: pwsh - run: | - $env:Path += ";C:\ProgramData\Habitat" - hab license accept - hab origin key download ${{ env.HAB_ORIGIN }} - hab origin key download --auth ${{ secrets.HAB_AUTH_TOKEN }} --secret ${{ env.HAB_ORIGIN }} - write-output "--- running windows hab build" - hab pkg build . - $hartfile=(ls ./results -Name | findstr "ohai") - hab pkg install ./results/$hartfile - . ./results/last_build.ps1 - habitat/tests/test.ps1 $pkg_ident \ No newline at end of file diff --git a/.github/workflows/habitat-publish.yml b/.github/workflows/habitat-publish.yml deleted file mode 100644 index 956eb1321..000000000 --- a/.github/workflows/habitat-publish.yml +++ /dev/null @@ -1,112 +0,0 @@ -name: Publish Habitat packages - -on: - push: - branches: - - workstation-LTS - release: - types: - - created - -env: - # BLDR URL Defined as: 'https://bldr.habitat.sh/' but as an env var in workspace settings. - BLDR_URL: ${{vars.BLDR_URL}} - # HAB_ORIGIN Defined as: 'chef' defined in workspace settings. - HAB_ORIGIN: ${{vars.HAB_ORIGIN}} - # BLDR_CHANNEL defaulted to unstable, but can be switched to stable, it is defined via the environment setting https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#using-an-environment - BLDR_CHANNEL: ${{ vars.BLDR_CHANNEL }} - # HABITAT_VERSION_SET this is the version of habitat CLI you are using, defaults to latest. - HABITAT_VERSION_SET: ${{vars.HABITAT_VERSION_SET}} - # HAB_PACKAGE is the name of the project you are on, IE: node-management-agent - HAB_PACKAGE: ${{vars.HAB_PACKAGE}} - # HAB_AUTH_TOKEN your orgs/projects auth token value - HAB_AUTH_TOKEN: ${{ secrets.HAB_AUTH_TOKEN }} - HAB_FALLBACK_CHANNEL: ${{vars.HAB_FALLBACK_CHANNEL}} - # HABITAT_TARGET this is the CPU arch for the linux CLI tool, its defaulted to x86_64 - #HABITAT_TARGET: $#{{vars.HABITAT_TARGET}} - # org-wide access token on https://github.com/organizations/progress-platform-services/settings/secrets/actions - -permissions: - contents: write - -jobs: - pre-build: - name: Setup before building packages - runs-on: ubuntu-latest - outputs: - app_version: ${{ steps.app_version.outputs.APP_VERSION }} - steps: - - name: Get branch name - id: get_branch_name - run: | - echo "BRANCH_NAME=${GITHUB_REF_NAME//\//-}" >> "$GITHUB_OUTPUT" - - name: Get version from tag - id: app_version - run: | - echo "APP_VERSION=${{ github.ref_type == 'tag' && github.ref_name || format('{0}-{1}', steps.get_branch_name.outputs.BRANCH_NAME, github.sha) }}" >> "$GITHUB_OUTPUT" - agent-matrix: - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest, windows-latest] - # matrix strategy is described at https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs - - runs-on: ${{ matrix.os }} - # free runner types are https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners - # from macos-latest, windows-latest, ubuntu-latest, ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, windows-2016 - # included software packages on runners are at https://github.com/actions/runner-images#available-images - # environment: unstable - steps: - - name: print OS - run: echo "--- ${{ matrix.os }}" - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - - name: install habitat on Linux - if: ${{ matrix.os == 'ubuntu-latest' }} - shell: bash - run: | - echo "--- STARTING HAB INSTALL ON ${{ matrix.os }} UBUNTU with habitat version:${{vars.HABITAT_VERSION_SET}}" - export HABITAT_VERSION="${{vars.HABITAT_VERSION_SET}}" - HABITAT_VERSION="${HABITAT_VERSION:?HABITAT_VERSION must be set}" - HABITAT_TARGET="${HABITAT_TARGET:-x86_64-linux}" - export HAB_FALLBACK_CHANNEL="${{vars.HAB_FALLBACK_CHANNEL}}" - curl https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh | sudo bash -s -- -v "$HABITAT_VERSION" -t "$HABITAT_TARGET" - - name: run Habitat packaging (linux) - if: ${{ matrix.os == 'ubuntu-latest' }} - shell: bash - run: | - hab license accept - hab origin key download $HAB_ORIGIN - hab origin key download --auth $HAB_AUTH_TOKEN --secret $HAB_ORIGIN - echo "--- running linux hab build" - hab pkg build . - echo "--- pushing to ${{ env.BLDR_URL }}/#/${{ env.HAB_ORIGIN }}/${{ env.HAB_PACKAGE }}..." - source results/last_build.env - hab pkg upload --auth $HAB_AUTH_TOKEN results/$pkg_artifact - echo "--- push complete!!" - - name: Install Habitat on Windows - if: ${{ matrix.os == 'windows-latest' }} - shell: pwsh - run: | - write-output "--- STARTING HAB INSTALL ON ${{ matrix.os }} WINDOWS with habitat version:${{vars.HABITAT_VERSION_SET}}" - $env:HAB_LICENSE = "accept-no-persist" - $env:HAB_FALLBACK_CHANNEL= "${{vars.HAB_FALLBACK_CHANNEL}}" - Invoke-Expression "& { $(Invoke-RestMethod https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1) } -Version ${{vars.HABITAT_VERSION_SET}}" - - name: run habitat packaging windows - if: ${{ matrix.os == 'windows-latest' }} - shell: pwsh - run: | - $env:Path += ";C:\ProgramData\Habitat" - hab license accept - hab origin key download ${{ env.HAB_ORIGIN }} - hab origin key download --auth ${{ secrets.HAB_AUTH_TOKEN }} --secret ${{ env.HAB_ORIGIN }} - write-output "--- running windows hab build" - hab pkg build . - write-output "--- pushing hab to unstable channel" - . results\last_build.ps1 - hab pkg upload results\$pkg_artifact --auth ${{ secrets.HAB_AUTH_TOKEN }} - write-output "--- push complete!!" \ No newline at end of file