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

Chef-18535 Removed the release branch changes and fixed pipeline #58

Merged
merged 2 commits into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .expeditor/build.habitat.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
---
env:
HAB_REFRESH_CHANNEL: "LTS-2024"

origin: chef

expeditor:
defaults:
buildkite:
retry:
automatic:
limit: 1
limit: 1
1 change: 0 additions & 1 deletion .expeditor/buildkite/artifact.habitat.test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# 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'
Expand Down
1 change: 0 additions & 1 deletion .expeditor/buildkite/artifact.habitat.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ export HAB_ORIGIN='ci'
export PLAN='fauxhai'
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
Expand Down
23 changes: 9 additions & 14 deletions .expeditor/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,29 @@
- fauxhai-chef

artifact_channels:
- dev
- workstation-build
- LTS-2024
- unstable
- chef-dke-lts2024

pipelines:
- verify:
description: Pull Request validation tests
public: true
- habitat/build:
description: Build the Habitat packages for faixhai
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
trigger: pull_request
env:
- HAB_NONINTERACTIVE: "true"
- HAB_NOCOLORING: "true"
- HAB_STUDIO_SECRET_HAB_NONINTERACTIVE: "true"

Check failure on line 33 in .expeditor/config.yml

View check run for this annotation

Chef Expeditor / Expeditor Config Validation

.expeditor/config.yml#L16-L33

Could not find .expeditor/verify.pipeline.yml in your repo

release_branches:
- workstation-LTS:
version_constraint: 0.*
- main:
version_constraint: 9.*

Expand Down Expand Up @@ -68,22 +65,20 @@
ignore_labels:
- "Expeditor: Skip Changelog"
- "Expeditor: Skip All"
- built_in:build_gem:
only_if: built_in:bump_version
- trigger_pipeline:habitat/build:
ignore_labels:
- "Expeditor: Skip Habitat"
- "Expeditor: Skip All"
only_if: built_in:bump_version

# Automatically promote the Habitat packages from unstable to dev upon successful build
- workload: buildkite_hab_build_group_published:{{agent_id}}:*
actions:
- built_in:promote_habitat_packages

# Subscribe to the promotion of the dev channel to acceptance
- workload: project_promoted:{{agent_id}}:dev:*
- workload: project_promoted:{{agent_id}}:*
actions:
- built_in:promote_habitat_packages
- built_in:rollover_changelog

- workload: project_promoted:{{agent_id}}:workstation-build:*
# 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
2 changes: 2 additions & 0 deletions .expeditor/habitat-test.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ expeditor:
defaults:
buildkite:
timeout_in_minutes: 30
env:
HAB_REFRESH_CHANNEL: "LTS-2024"
retry:
automatic:
limit: 1
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.6
9.3.19
1 change: 0 additions & 1 deletion habitat/plan.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
$ErrorActionPreference = "Stop"
$PSDefaultParameterValues['*:ErrorAction']='Stop'

$env:HAB_BLDR_CHANNEL = "LTS-2024"
$pkg_name="fauxhai"
$pkg_origin="core"
$pkg_version=$(Get-Content "$PLAN_CONTEXT/../VERSION")
Expand Down
2 changes: 1 addition & 1 deletion habitat/plan.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export HAB_BLDR_CHANNEL="LTS-2024"
pkg_name=fauxhai
pkg_origin=chef
ruby_pkg="core/ruby3_1"
Expand All @@ -11,6 +10,7 @@ pkg_build_deps=(
core/libarchive
)
pkg_bin_dirs=(bin)

do_setup_environment() {
build_line 'Setting GEM_HOME="$pkg_prefix/vendor"'
export GEM_HOME="$pkg_prefix/vendor"
Expand Down
2 changes: 1 addition & 1 deletion lib/fauxhai/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Fauxhai
VERSION = "0.1.6".freeze
VERSION = "9.3.19".freeze
end
Loading