From 7c16c79d637d59877222e63a40c45eaad9e823ec Mon Sep 17 00:00:00 2001 From: Sean Simmons Date: Mon, 23 Dec 2024 14:24:42 -0500 Subject: [PATCH 01/15] re-working expeditor config you will need to manually create the habitat packages: workstation-build, stable, workstation-LTS for this workflow to work properlly for now i will create them via the build, just once, then undo the commit Signed-off-by: Sean Simmons --- .expeditor/config.yml | 44 ++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 5250fd96..dbfcdcc6 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -12,10 +12,21 @@ rubygems: artifact_channels: - workstation-build - stable + - workstation-LTS + +pipelines: + - verify: + description: Pull Request validation tests + public: true + - habitat/build: + description: Build the Habitat packages for faixhai + - habitat/test: + definition: .expeditor/habitat-test.pipeline.yml + trigger: default release_branches: - workstation-LTS: - version_constraint: 9.* + version_constraint: 10.* - main: version_constraint: 9.* @@ -50,27 +61,26 @@ subscriptions: - "Expeditor: Skip All" - built_in:build_gem: only_if: built_in:bump_version - - trigger_pipeline:habitat/publish: + - trigger_pipeline:habitat/build: only_if: built_in:bump_version ignore_labels: - "Expeditor: Skip Habitat" - "Expeditor: Skip All" - - trigger_pipeline:habitat/test: - 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 + + # Automatically TEST then promote the Habitat packages from unstable to workstation-build upon successful build - workload: buildkite_hab_build_group_published:{{agent_id}}:* actions: - # when all of the hab package publish to the unstable channel, test and promote them - - bash:.expeditor/promote-hab-pkg.sh + - trigger_pipeline:habitat/test - built_in:promote_habitat_packages -pipelines: - - verify: - description: Pull Request validation tests - public: true \ No newline at end of file + # Subscribe to the promotion of the workstation-build channel to stable + - workload: project_promoted:{{agent_id}}:workstation-build:* + actions: + - built_in:promote_habitat_packages + + # Subscribe to the promotion of the stable channel to workstation-LTS + - workload: project_promoted:{{agent_id}}:stable:* + actions: + - built_in:promote_habitat_packages + - built_in:rollover_changelog + - built_in:publish_rubygems \ No newline at end of file From 29c972911fd279b85cd04c0e16573e6fa3330e65 Mon Sep 17 00:00:00 2001 From: Sean Simmons Date: Mon, 23 Dec 2024 14:28:27 -0500 Subject: [PATCH 02/15] updating do_before just to add the channels once Signed-off-by: Sean Simmons --- habitat/plan.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/habitat/plan.sh b/habitat/plan.sh index c77729cf..7d277cab 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -23,6 +23,9 @@ pkg_version() { cat "$SRC_PATH/VERSION" } do_before() { + hab bldr channel create -o chef workstation-build + hab bldr channel create -o chef stable + hab bldr channel create -o chef workstation-LTS update_pkg_version } do_unpack() { From 1fd9515ca946b6b684dc95d0d0814440d5d62ae6 Mon Sep 17 00:00:00 2001 From: Sean Simmons Date: Mon, 23 Dec 2024 15:07:33 -0500 Subject: [PATCH 03/15] fixing expeditor error config Signed-off-by: Sean Simmons --- .expeditor/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index dbfcdcc6..1d4c99e5 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -59,13 +59,13 @@ subscriptions: ignore_labels: - "Expeditor: Skip Changelog" - "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" + only_if: built_in:bump_version + - built_in:build_gem: + only_if: built_in:bump_version # Automatically TEST then promote the Habitat packages from unstable to workstation-build upon successful build - workload: buildkite_hab_build_group_published:{{agent_id}}:* From b9a3e210dcbd699ee71f91e71a0c9a2a738480e1 Mon Sep 17 00:00:00 2001 From: Sean Simmons Date: Mon, 23 Dec 2024 15:22:27 -0500 Subject: [PATCH 04/15] fixing expeditor error config Signed-off-by: Sean Simmons --- .expeditor/config.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 1d4c99e5..47838236 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -68,19 +68,19 @@ subscriptions: only_if: built_in:bump_version # Automatically TEST then promote the Habitat packages from unstable to workstation-build upon successful build - - workload: buildkite_hab_build_group_published:{{agent_id}}:* - actions: - - trigger_pipeline:habitat/test - - built_in:promote_habitat_packages + # - workload: buildkite_hab_build_group_published:{{agent_id}}:* + # actions: + # - trigger_pipeline:habitat/test + # - built_in:promote_habitat_packages - # Subscribe to the promotion of the workstation-build channel to stable - - workload: project_promoted:{{agent_id}}:workstation-build:* - actions: - - built_in:promote_habitat_packages + # # Subscribe to the promotion of the workstation-build channel to stable + # - workload: project_promoted:{{agent_id}}:workstation-build:* + # actions: + # - built_in:promote_habitat_packages - # Subscribe to the promotion of the stable channel to workstation-LTS - - workload: project_promoted:{{agent_id}}:stable:* - actions: - - built_in:promote_habitat_packages - - built_in:rollover_changelog - - built_in:publish_rubygems \ No newline at end of file + # # Subscribe to the promotion of the stable channel to workstation-LTS + # - workload: project_promoted:{{agent_id}}:stable:* + # actions: + # - built_in:promote_habitat_packages + # - built_in:rollover_changelog + # - built_in:publish_rubygems \ No newline at end of file From 8315cebe47fb4273bd4bf7db7d82c480da136d4f Mon Sep 17 00:00:00 2001 From: Sean Simmons Date: Mon, 23 Dec 2024 15:24:05 -0500 Subject: [PATCH 05/15] fixing expeditor error config Signed-off-by: Sean Simmons --- .expeditor/config.yml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 47838236..8da0f07c 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -68,19 +68,21 @@ subscriptions: only_if: built_in:bump_version # Automatically TEST then promote the Habitat packages from unstable to workstation-build upon successful build - # - workload: buildkite_hab_build_group_published:{{agent_id}}:* - # actions: - # - trigger_pipeline:habitat/test - # - built_in:promote_habitat_packages + - workload: buildkite_hab_build_group_published:{{agent_id}}:* + actions: + - trigger_pipeline:habitat/test: + post_commit: true + only_if: built_in:trigger_pipeline:habitat/build + - built_in:promote_habitat_packages - # # Subscribe to the promotion of the workstation-build channel to stable - # - workload: project_promoted:{{agent_id}}:workstation-build:* - # actions: - # - built_in:promote_habitat_packages + # Subscribe to the promotion of the workstation-build channel to stable + - workload: project_promoted:{{agent_id}}:workstation-build:* + actions: + - built_in:promote_habitat_packages - # # Subscribe to the promotion of the stable channel to workstation-LTS - # - workload: project_promoted:{{agent_id}}:stable:* - # actions: - # - built_in:promote_habitat_packages - # - built_in:rollover_changelog - # - built_in:publish_rubygems \ No newline at end of file + # Subscribe to the promotion of the stable channel to workstation-LTS + - workload: project_promoted:{{agent_id}}:stable:* + actions: + - built_in:promote_habitat_packages + - built_in:rollover_changelog + - built_in:publish_rubygems \ No newline at end of file From 138827e0ab5f2c2d9e20d5b5e444113a8bf090e6 Mon Sep 17 00:00:00 2001 From: Sean Simmons Date: Mon, 23 Dec 2024 15:26:00 -0500 Subject: [PATCH 06/15] fixing expeditor error config Signed-off-by: Sean Simmons --- .expeditor/config.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 8da0f07c..e2911834 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -49,6 +49,7 @@ subscriptions: # These actions are taken, in order they are specified, anytime a Pull Request is merged. - workload: pull_request_merged:{{github_repo}}:{{release_branch}}:* actions: + - trigger_pipeline:habitat/test - built_in:bump_version: ignore_labels: - "Expeditor: Skip Version Bump" @@ -67,12 +68,8 @@ subscriptions: - built_in:build_gem: only_if: built_in:bump_version - # Automatically TEST then promote the Habitat packages from unstable to workstation-build upon successful build + # Automatically promote the Habitat packages from unstable to workstation-build upon successful build - workload: buildkite_hab_build_group_published:{{agent_id}}:* - actions: - - trigger_pipeline:habitat/test: - post_commit: true - only_if: built_in:trigger_pipeline:habitat/build - built_in:promote_habitat_packages # Subscribe to the promotion of the workstation-build channel to stable From 290f12a586aa0511a6985af956a32b67881c93f2 Mon Sep 17 00:00:00 2001 From: Sean Simmons Date: Mon, 23 Dec 2024 15:29:31 -0500 Subject: [PATCH 07/15] fixing expeditor error config Signed-off-by: Sean Simmons --- .expeditor/config.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index e2911834..593a671d 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -49,7 +49,6 @@ subscriptions: # These actions are taken, in order they are specified, anytime a Pull Request is merged. - workload: pull_request_merged:{{github_repo}}:{{release_branch}}:* actions: - - trigger_pipeline:habitat/test - built_in:bump_version: ignore_labels: - "Expeditor: Skip Version Bump" @@ -68,8 +67,10 @@ subscriptions: - built_in:build_gem: only_if: built_in:bump_version - # Automatically promote the Habitat packages from unstable to workstation-build upon successful build + # Automatically TEST then promote the Habitat packages from unstable to workstation-build upon successful build - workload: buildkite_hab_build_group_published:{{agent_id}}:* + actions: + - trigger_pipeline:habitat/test - built_in:promote_habitat_packages # Subscribe to the promotion of the workstation-build channel to stable @@ -78,8 +79,8 @@ subscriptions: - built_in:promote_habitat_packages # Subscribe to the promotion of the stable channel to workstation-LTS - - workload: project_promoted:{{agent_id}}:stable:* - actions: - - built_in:promote_habitat_packages - - built_in:rollover_changelog - - built_in:publish_rubygems \ No newline at end of file + # - workload: project_promoted:{{agent_id}}:stable:* + # actions: + # - built_in:promote_habitat_packages + # - built_in:rollover_changelog + # - built_in:publish_rubygems \ No newline at end of file From 0e721f397ccb8d39849a8b153fdcbdd465ad24b5 Mon Sep 17 00:00:00 2001 From: Sean Simmons Date: Mon, 23 Dec 2024 15:30:25 -0500 Subject: [PATCH 08/15] fixing expeditor error config Signed-off-by: Sean Simmons --- .expeditor/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 593a671d..29f854df 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -78,9 +78,9 @@ subscriptions: actions: - built_in:promote_habitat_packages - # Subscribe to the promotion of the stable channel to workstation-LTS - # - workload: project_promoted:{{agent_id}}:stable:* - # actions: - # - built_in:promote_habitat_packages - # - built_in:rollover_changelog - # - built_in:publish_rubygems \ No newline at end of file + Subscribe to the promotion of the stable channel to workstation-LTS + - workload: project_promoted:{{agent_id}}:stable:* + actions: + - built_in:rollover_changelog + - built_in:promote_habitat_packages + - built_in:publish_rubygems \ No newline at end of file From f9d8d23c18352f9a7216d01432bbdcdc4409346b Mon Sep 17 00:00:00 2001 From: Sean Simmons Date: Mon, 23 Dec 2024 15:30:43 -0500 Subject: [PATCH 09/15] fixing expeditor error config Signed-off-by: Sean Simmons --- .expeditor/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 29f854df..a7b6f437 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -78,7 +78,7 @@ subscriptions: actions: - built_in:promote_habitat_packages - Subscribe to the promotion of the stable channel to workstation-LTS + # Subscribe to the promotion of the stable channel to workstation-LTS - workload: project_promoted:{{agent_id}}:stable:* actions: - built_in:rollover_changelog From 2100e164dc37c767d1890a2811d4d8b24de3d379 Mon Sep 17 00:00:00 2001 From: Sean Simmons Date: Mon, 30 Dec 2024 19:05:25 -0500 Subject: [PATCH 10/15] updtaing workflow for expeditor config also updating script to promote from STABLE to workstation-LTS Signed-off-by: Sean Simmons --- .expeditor/config.yml | 25 ++++++++++----------- .expeditor/promote-hab-pkg.sh | 41 ++++++++++++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index a7b6f437..99f5606f 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -67,20 +67,19 @@ subscriptions: - built_in:build_gem: only_if: built_in:bump_version - # Automatically TEST then promote the Habitat packages from unstable to workstation-build upon successful build - - workload: buildkite_hab_build_group_published:{{agent_id}}:* +# this is the only way currently to promote built-in rubygems publish + - workload: project_promoted:{{agent_id}}:* actions: - - trigger_pipeline:habitat/test + - built_in:rollover_changelog - built_in:promote_habitat_packages + - built_in:publish_rubygems - # Subscribe to the promotion of the workstation-build channel to stable - - workload: project_promoted:{{agent_id}}:workstation-build:* - actions: - - built_in:promote_habitat_packages - - # Subscribe to the promotion of the stable channel to workstation-LTS - - workload: project_promoted:{{agent_id}}:stable:* + # subscription to fire off any other promotions that you may need for an additional channnel like LTS or something. + - workload: staged_workload_released:{{agent_id}}:hab_unstable_promote:* actions: - - built_in:rollover_changelog - - built_in:promote_habitat_packages - - built_in:publish_rubygems \ No newline at end of file + - bash:.expeditor/scripts/promote-hab-pkgs.sh: + post_commit: true + +staging_areas: + - hab_unstable_promote: + workload: hab_package_published:stable:chef/fauxhai/{{version_constraint}} \ No newline at end of file diff --git a/.expeditor/promote-hab-pkg.sh b/.expeditor/promote-hab-pkg.sh index 6b8dddd2..cd9138f6 100644 --- a/.expeditor/promote-hab-pkg.sh +++ b/.expeditor/promote-hab-pkg.sh @@ -1,10 +1,45 @@ #!/bin/bash +# +# The following standard Expeditor artifact_actions environment variables +# are automatically set by the calling process: +# +# PROMOTABLE - in promotion artifact actions this is a reference to the +# source channel. +# TARGET_CHANNEL - the channel which we are promoting to +# HAB_AUTH_TOKEN - GitHub Auth token used to communicate with the +# Habitat depot and private repos in Chef's GitHub org +# set -eou pipefail -echo "--> Running the promote-hab-pkg.sh script" +# Export the HAB_AUTH_TOKEN for use of promoting habitat packages to {{TARGET_CHANNEL}} HAB_AUTH_TOKEN=$(vault kv get -field auth_token account/static/habitat/chef-ci) export HAB_AUTH_TOKEN -source_channel="workstation-build" - hab pkg promote "${EXPEDITOR_PKG_IDENT}" "${EXPEDITOR_TARGET_CHANNEL}" "${EXPEDITOR_PKG_TARGET}" \ No newline at end of file + +# when this workflow runs, there are env vars that are available to us in the running pod, we are grabbing the source ENV, then assigning it to our next channel +if [[ "${EXPEDITOR_CHANNEL}" == "unstable" ]]; then + echo "This file does not support actions for artifacts promoted to unstable" + exit 1 +elif [[ "${EXPEDITOR_CHANNEL}" == "stable" ]]; then + export EXPEDITOR_TARGET_CHANNEL="workstation-LTS" + echo "My current package is in channel: ${EXPEDITOR_CHANNEL}. I am promoting to ${EXPEDITOR_TARGET_CHANNEL}" +# elif [[ "${EXPEDITOR_CHANNEL}" == "acceptance" ]]; then +# export EXPEDITOR_TARGET_CHANNEL="current" +# echo "My current package is in channel: ${EXPEDITOR_CHANNEL}. I am promoting to ${EXPEDITOR_TARGET_CHANNEL}" +# elif [[ "${EXPEDITOR_CHANNEL}" == "current" ]]; then +# export EXPEDITOR_TARGET_CHANNEL="stable" +# echo "My current package is in channel: ${EXPEDITOR_CHANNEL}. I am promoting to ${EXPEDITOR_TARGET_CHANNEL}" +else + echo "Unknown EXPEDITOR_CHANNEL: ${EXPEDITOR_CHANNEL}" + exit 1 +fi + +# Promote the artifacts in Habitat Depot + if [[ "${EXPEDITOR_PKG_ORIGIN}" == "core" ]]; + then + echo "Skipping promotion of core origin package ${EXPEDITOR_PKG_ORIGIN}" + else + echo "Promoting ${EXPEDITOR_PKG_IDENT} to the ${EXPEDITOR_TARGET_CHANNEL} channel" + hab pkg promote "${EXPEDITOR_PKG_IDENT}" "${EXPEDITOR_TARGET_CHANNEL}" + fi From 7b4934057f9e630f1ae00fe887b7a83b07a05dcc Mon Sep 17 00:00:00 2001 From: Sean Simmons Date: Mon, 30 Dec 2024 19:09:30 -0500 Subject: [PATCH 11/15] updating comments Signed-off-by: Sean Simmons --- .expeditor/promote-hab-pkg.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.expeditor/promote-hab-pkg.sh b/.expeditor/promote-hab-pkg.sh index cd9138f6..673f7b4f 100644 --- a/.expeditor/promote-hab-pkg.sh +++ b/.expeditor/promote-hab-pkg.sh @@ -1,25 +1,31 @@ #!/bin/bash # -# The following standard Expeditor artifact_actions environment variables -# are automatically set by the calling process: +# when using the following workflow, the following env vars are available to us for use. + +# # subscription to fire off any other promotions that you may need for an additional channnel like LTS or something. +# - workload: staged_workload_released:{{agent_id}}:hab_unstable_promote:* +# actions: +# - bash:.expeditor/scripts/promote-hab-pkgs.sh: +# post_commit: true # # PROMOTABLE - in promotion artifact actions this is a reference to the # source channel. -# TARGET_CHANNEL - the channel which we are promoting to +# EXPEDITOR_CHANNEL - Read from the expeditor config, this should be the "lowest" channel in your promotion. IE: unstable +# EXPEDITOR_TARGET_CHANNEL - the channel which we are promoting to # HAB_AUTH_TOKEN - GitHub Auth token used to communicate with the # Habitat depot and private repos in Chef's GitHub org # set -eou pipefail -# Export the HAB_AUTH_TOKEN for use of promoting habitat packages to {{TARGET_CHANNEL}} +# Export the HAB_AUTH_TOKEN for use of promoting habitat packages to {{EXPEDITOR_TARGET_CHANNEL}} HAB_AUTH_TOKEN=$(vault kv get -field auth_token account/static/habitat/chef-ci) export HAB_AUTH_TOKEN # when this workflow runs, there are env vars that are available to us in the running pod, we are grabbing the source ENV, then assigning it to our next channel if [[ "${EXPEDITOR_CHANNEL}" == "unstable" ]]; then - echo "This file does not support actions for artifacts promoted to unstable" + echo "This file does not support actions for artifacts promoted to unstable, that should happen in the /expeditor promote AGENT VERSION command from slack" exit 1 elif [[ "${EXPEDITOR_CHANNEL}" == "stable" ]]; then export EXPEDITOR_TARGET_CHANNEL="workstation-LTS" From 371c38399f662d7ee0837c91cb8932d99b0c4de5 Mon Sep 17 00:00:00 2001 From: Sean Simmons Date: Thu, 2 Jan 2025 09:12:47 -0500 Subject: [PATCH 12/15] removing for a test Signed-off-by: Sean Simmons --- habitat/plan.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/habitat/plan.sh b/habitat/plan.sh index 7d277cab..d02f477c 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -23,9 +23,9 @@ pkg_version() { cat "$SRC_PATH/VERSION" } do_before() { - hab bldr channel create -o chef workstation-build - hab bldr channel create -o chef stable - hab bldr channel create -o chef workstation-LTS + # hab bldr channel create -o chef workstation-build + # hab bldr channel create -o chef stable + # hab bldr channel create -o chef workstation-LTS update_pkg_version } do_unpack() { From db77ec24631934abb0d3c8c1e39ce5bb3fcff16d Mon Sep 17 00:00:00 2001 From: Sean Simmons Date: Thu, 2 Jan 2025 09:20:51 -0500 Subject: [PATCH 13/15] moving this value back as requested Signed-off-by: Sean Simmons --- .expeditor/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 99f5606f..3be0c505 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -26,7 +26,7 @@ pipelines: release_branches: - workstation-LTS: - version_constraint: 10.* + version_constraint: 9.* - main: version_constraint: 9.* From 99e8426bcf7a1305a125555bb5faee7a6050ad4b Mon Sep 17 00:00:00 2001 From: Sean Simmons Date: Thu, 2 Jan 2025 09:27:50 -0500 Subject: [PATCH 14/15] moving this value back as requested Signed-off-by: Sean Simmons --- habitat/plan.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/habitat/plan.sh b/habitat/plan.sh index d02f477c..c77729cf 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -23,9 +23,6 @@ pkg_version() { cat "$SRC_PATH/VERSION" } do_before() { - # hab bldr channel create -o chef workstation-build - # hab bldr channel create -o chef stable - # hab bldr channel create -o chef workstation-LTS update_pkg_version } do_unpack() { From 2e56935629708bfaeb1b9f1c2d0248bf5130ef85 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Fri, 3 Jan 2025 13:40:30 +0530 Subject: [PATCH 15/15] updated the channel from workstation-LTS to LTS-2024 Signed-off-by: nikhil2611 --- .expeditor/config.yml | 2 +- .expeditor/promote-hab-pkg.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 3be0c505..e72f9962 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -12,7 +12,7 @@ rubygems: artifact_channels: - workstation-build - stable - - workstation-LTS + - LTS-2024 pipelines: - verify: diff --git a/.expeditor/promote-hab-pkg.sh b/.expeditor/promote-hab-pkg.sh index 673f7b4f..e59b2450 100644 --- a/.expeditor/promote-hab-pkg.sh +++ b/.expeditor/promote-hab-pkg.sh @@ -28,7 +28,7 @@ if [[ "${EXPEDITOR_CHANNEL}" == "unstable" ]]; then echo "This file does not support actions for artifacts promoted to unstable, that should happen in the /expeditor promote AGENT VERSION command from slack" exit 1 elif [[ "${EXPEDITOR_CHANNEL}" == "stable" ]]; then - export EXPEDITOR_TARGET_CHANNEL="workstation-LTS" + export EXPEDITOR_TARGET_CHANNEL="LTS-2024" echo "My current package is in channel: ${EXPEDITOR_CHANNEL}. I am promoting to ${EXPEDITOR_TARGET_CHANNEL}" # elif [[ "${EXPEDITOR_CHANNEL}" == "acceptance" ]]; then # export EXPEDITOR_TARGET_CHANNEL="current"