From 42ffd2f343686a927e33ffd2fe369200afd3ff49 Mon Sep 17 00:00:00 2001 From: Anuj Singh <60409639+singholt@users.noreply.github.com> Date: Mon, 13 Apr 2026 16:50:38 -0700 Subject: [PATCH 1/2] Fix release workflow branch handling and add GitHub App token - Use 'git fetch origin' instead of 'git fetch origin dev:dev' to avoid errors when a local branch already exists or is checked out - Create staging branch from current HEAD instead of origin/dev, allowing the workflow to use whichever branch is selected in the GitHub UI - Use origin/master and origin/dev remote refs in changelog script instead of local branch names - Remove stderr suppression in changelog script for easier debugging - Add GitHub App token generation for PR creation --- .github/workflows/create-release-pr.yml | 17 +++++++++++------ scripts/generate-release-changelog.sh | 6 +++--- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml index 136f7d36642..d8cc5c1450f 100644 --- a/.github/workflows/create-release-pr.yml +++ b/.github/workflows/create-release-pr.yml @@ -42,16 +42,14 @@ jobs: fi echo "Release v${AGENT_VERSION} does not exist. Proceeding." - - name: Fetch dev branch + - name: Fetch latest remote refs run: | - git fetch origin dev:dev + git fetch origin - name: Create staging branch run: | BRANCH_NAME="v${AGENT_VERSION}-stage" - git checkout -b "$BRANCH_NAME" origin/dev - COMMIT_SHA=$(git rev-parse HEAD) - echo "Staging branch: $BRANCH_NAME at $COMMIT_SHA" + git checkout -b "$BRANCH_NAME" echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV - name: Generate changelog @@ -139,6 +137,13 @@ jobs: git config user.email "amazon-ecs-bot@amazon.com" git commit -m "Release ${AGENT_VERSION}" + - name: Generate App Token + id: app-token + uses: actions/create-github-app-token@v3 + with: + app-id: ${{ secrets.APP_ID }} + private-key: ${{ secrets.APP_PRIVATE_KEY }} + - name: Push staging branch to origin run: | echo "Pushing branch ${BRANCH_NAME} to origin..." @@ -146,7 +151,7 @@ jobs: - name: Create pull request env: - GH_TOKEN: ${{ secrets.ECS_AGENT_WORKFLOW_SECRET }} + GH_TOKEN: ${{ steps.app-token.outputs.token }} run: | PR_BODY=$(cat </dev/null) + commits=$(git log ${BASE_BRANCH}..${DEV_BRANCH} --no-merges --format=%H) if [ $? -ne 0 ]; then log_error "Failed to get commits. Make sure you're in a git repository and both ${BASE_BRANCH} and ${DEV_BRANCH} branches exist" From 30cacc204a4aa60237e2fccedac9b559f6d27e98 Mon Sep 17 00:00:00 2001 From: amazon-ecs-bot Date: Tue, 14 Apr 2026 16:47:19 +0000 Subject: [PATCH 2/2] Release 1.999.99 --- CHANGELOG.md | 9 +++ VERSION | 2 +- agent/version/version.go | 4 +- ecs-init/ECSVERSION | 2 +- ecs-init/config/common.go | 2 +- .../ecs-agent.spec | 59 ++++++++++--------- .../generic-deb-integrated/debian/changelog | 6 ++ .../amazon-ecs-init.spec | 5 +- packaging/suse/amazon-ecs-init.changes | 4 ++ scripts/changelog/CHANGELOG_MASTER | 5 ++ 10 files changed, 64 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77762e21813..ca7d46b6051 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +# 1.999.99 +* Enhancement - Emit duration metrics for TACS connect/disconnect [#4928](https://github.com/aws/amazon-ecs-agent/pull/4928) +* Enhancement - Bump github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream from 1.6.10 to 1.7.8 in /agent [#4922](https://github.com/aws/amazon-ecs-agent/pull/4922) +* Enhancement - Bump github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream from 1.6.5 to 1.7.8 in /ecs-init [#4925](https://github.com/aws/amazon-ecs-agent/pull/4925) +* Enhancement - Track and emit metric for disconnect time from ACS [#4920](https://github.com/aws/amazon-ecs-agent/pull/4920) +* Enhancement - engine: skip execution role checks when task desired status is stopped [#4918](https://github.com/aws/amazon-ecs-agent/pull/4918) +* Enhancement - Add NeuronDevices type and sysfs-based device discovery [#4919](https://github.com/aws/amazon-ecs-agent/pull/4919) +* Bugfix - fix(netlib): Conditionally add IPv6 subnet to IPAM config when IPv6 … [#4916](https://github.com/aws/amazon-ecs-agent/pull/4916) + # 1.102.2 * Enhancement - Update SSM exec agent version to 3.3.4108.0 [#4912](https://github.com/aws/amazon-ecs-agent/pull/4912) * Enhancement - Update Go version to 1.25.8 [#4894](https://github.com/aws/amazon-ecs-agent/pull/4894) diff --git a/VERSION b/VERSION index acf18fb6640..1b55fc3447a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.102.2 +1.999.99 diff --git a/agent/version/version.go b/agent/version/version.go index fd0d3acb3b9..57c956c77df 100644 --- a/agent/version/version.go +++ b/agent/version/version.go @@ -22,10 +22,10 @@ package version // repository. Only the 'Version' const should change in checked-in source code // Version is the version of the Agent -const Version = "1.102.2" +const Version = "1.999.99" // GitDirty indicates the cleanliness of the git repo when this agent was built const GitDirty = true // GitShortHash is the short hash of this agent build -const GitShortHash = "aa836854" +const GitShortHash = "42ffd2f3" diff --git a/ecs-init/ECSVERSION b/ecs-init/ECSVERSION index acf18fb6640..1b55fc3447a 100644 --- a/ecs-init/ECSVERSION +++ b/ecs-init/ECSVERSION @@ -1 +1 @@ -1.102.2 +1.999.99 diff --git a/ecs-init/config/common.go b/ecs-init/config/common.go index 8e53680b0cb..b4327cb485d 100644 --- a/ecs-init/config/common.go +++ b/ecs-init/config/common.go @@ -46,7 +46,7 @@ const ( // DefaultAgentVersion is the version of the agent that will be // fetched if required. This should look like v1.2.3 or an // 8-character sha, as is downloadable from S3. - DefaultAgentVersion = "v1.102.2" + DefaultAgentVersion = "v1.999.99" // AgentPartitionBucketName is the name of the paritional s3 bucket that stores the agent AgentPartitionBucketName = "amazon-ecs-agent" diff --git a/packaging/amazon-linux-ami-integrated/ecs-agent.spec b/packaging/amazon-linux-ami-integrated/ecs-agent.spec index 6d0fc832571..e37e121d0e0 100644 --- a/packaging/amazon-linux-ami-integrated/ecs-agent.spec +++ b/packaging/amazon-linux-ami-integrated/ecs-agent.spec @@ -27,7 +27,7 @@ %global ebs_csi_driver_dir /var/lib/ecs/deps/daemons/ebs-csi-driver Name: ecs-init -Version: 1.102.2 +Version: 1.999.99 Release: 1%{?dist} License: Apache 2.0 Summary: Amazon Elastic Container Service initialization application @@ -61,6 +61,15 @@ Requires: procps # statements by reading out the vendor directory: # # find ../../ecs-init/vendor -name \*.go -exec dirname {} \; | sort | uniq | sed 's,^.*ecs-init/vendor/,,; s/^/bundled(golang(/; s/$/))/;' | sed 's/^/Provides:\t/' | expand - +Provides: bundled(golang(github.com/Azure/go-ansiterm)) +Provides: bundled(golang(github.com/Azure/go-ansiterm/winterm)) +Provides: bundled(golang(github.com/Microsoft/go-winio)) +Provides: bundled(golang(github.com/Microsoft/go-winio/internal/fs)) +Provides: bundled(golang(github.com/Microsoft/go-winio/internal/socket)) +Provides: bundled(golang(github.com/Microsoft/go-winio/internal/stringbuffer)) +Provides: bundled(golang(github.com/Microsoft/go-winio/pkg/guid)) +Provides: bundled(golang(github.com/NVIDIA/go-nvml/pkg/dl)) +Provides: bundled(golang(github.com/NVIDIA/go-nvml/pkg/nvml)) Provides: bundled(golang(github.com/aws/amazon-ecs-agent/ecs-agent/awsrulesfn)) Provides: bundled(golang(github.com/aws/amazon-ecs-agent/ecs-agent/ipcompatibility)) Provides: bundled(golang(github.com/aws/amazon-ecs-agent/ecs-agent/logger)) @@ -68,23 +77,6 @@ Provides: bundled(golang(github.com/aws/amazon-ecs-agent/ecs-agent/utils)) Provides: bundled(golang(github.com/aws/amazon-ecs-agent/ecs-agent/utils/net)) Provides: bundled(golang(github.com/aws/amazon-ecs-agent/ecs-agent/utils/netlinkwrapper)) Provides: bundled(golang(github.com/aws/amazon-ecs-agent/ecs-agent/utils/netlinkwrapper/mocks)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws)) Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/arn)) Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/defaults)) @@ -143,13 +135,30 @@ Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/ Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/types)) Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/sso)) Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/sso/internal/endpoints)) +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/sso/types)) Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/ssooidc)) Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/ssooidc/internal/endpoints)) Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/ssooidc/types)) -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/sso/types)) Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/sts)) Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/sts/internal/endpoints)) Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/sts/types)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) Provides: bundled(golang(github.com/aws/smithy-go)) Provides: bundled(golang(github.com/aws/smithy-go/auth)) Provides: bundled(golang(github.com/aws/smithy-go/auth/bearer)) @@ -177,8 +186,6 @@ Provides: bundled(golang(github.com/aws/smithy-go/tracing)) Provides: bundled(golang(github.com/aws/smithy-go/transport/http)) Provides: bundled(golang(github.com/aws/smithy-go/transport/http/internal/io)) Provides: bundled(golang(github.com/aws/smithy-go/waiter)) -Provides: bundled(golang(github.com/Azure/go-ansiterm)) -Provides: bundled(golang(github.com/Azure/go-ansiterm/winterm)) Provides: bundled(golang(github.com/cihub/seelog)) Provides: bundled(golang(github.com/cihub/seelog/archive)) Provides: bundled(golang(github.com/cihub/seelog/archive/gzip)) @@ -228,11 +235,6 @@ Provides: bundled(golang(github.com/klauspost/compress/internal/cpuinfo)) Provides: bundled(golang(github.com/klauspost/compress/internal/snapref)) Provides: bundled(golang(github.com/klauspost/compress/zstd)) Provides: bundled(golang(github.com/klauspost/compress/zstd/internal/xxhash)) -Provides: bundled(golang(github.com/Microsoft/go-winio)) -Provides: bundled(golang(github.com/Microsoft/go-winio/internal/fs)) -Provides: bundled(golang(github.com/Microsoft/go-winio/internal/socket)) -Provides: bundled(golang(github.com/Microsoft/go-winio/internal/stringbuffer)) -Provides: bundled(golang(github.com/Microsoft/go-winio/pkg/guid)) Provides: bundled(golang(github.com/moby/patternmatcher)) Provides: bundled(golang(github.com/moby/sys/sequential)) Provides: bundled(golang(github.com/moby/sys/user)) @@ -240,8 +242,6 @@ Provides: bundled(golang(github.com/moby/sys/userns)) Provides: bundled(golang(github.com/moby/term)) Provides: bundled(golang(github.com/moby/term/windows)) Provides: bundled(golang(github.com/morikuni/aec)) -Provides: bundled(golang(github.com/NVIDIA/go-nvml/pkg/dl)) -Provides: bundled(golang(github.com/NVIDIA/go-nvml/pkg/nvml)) Provides: bundled(golang(github.com/opencontainers/go-digest)) Provides: bundled(golang(github.com/opencontainers/image-spec/specs-go)) Provides: bundled(golang(github.com/opencontainers/image-spec/specs-go/v1)) @@ -393,6 +393,9 @@ fi %endif %changelog +* Tue Apr 14 2026 amazon-ecs-bot - 1.999.99-1 +- Cache Agent version 1.999.99 + * Mon Mar 30 2026 Amogh Rathore - 1.102.2-1 - Cache Agent version 1.102.2 diff --git a/packaging/generic-deb-integrated/debian/changelog b/packaging/generic-deb-integrated/debian/changelog index 83691971c4b..4e5381f5ead 100644 --- a/packaging/generic-deb-integrated/debian/changelog +++ b/packaging/generic-deb-integrated/debian/changelog @@ -1,3 +1,9 @@ +amazon-ecs-init (1.999.99-1) stable; urgency=medium + + * Cache Agent version 1.999.99 + + -- amazon-ecs-bot Tue, 14 Apr 2026 18:00:00 +0000 + amazon-ecs-init (1.102.2-1) stable; urgency=medium * Cache Agent version 1.102.2 diff --git a/packaging/generic-rpm-integrated/amazon-ecs-init.spec b/packaging/generic-rpm-integrated/amazon-ecs-init.spec index cb02881f6f7..160f1a20eda 100644 --- a/packaging/generic-rpm-integrated/amazon-ecs-init.spec +++ b/packaging/generic-rpm-integrated/amazon-ecs-init.spec @@ -19,7 +19,7 @@ %global agent_image ecs-agent-v%{version}.tar Name: amazon-ecs-init -Version: 1.102.2 +Version: 1.999.99 Release: 1 License: Apache 2.0 Summary: Amazon Elastic Container Service initialization application @@ -93,6 +93,9 @@ ln -sf %{basename:%{agent_image}} %{_cachedir}/ecs/ecs-agent.tar %systemd_postun_with_restart amazon-ecs-volume-plugin %changelog +* Tue Apr 14 2026 amazon-ecs-bot - 1.999.99-1 +- Cache Agent version 1.999.99 + * Mon Mar 30 2026 Amogh Rathore - 1.102.2-1 - Cache Agent version 1.102.2 diff --git a/packaging/suse/amazon-ecs-init.changes b/packaging/suse/amazon-ecs-init.changes index d5e45bf7c50..98e6d446577 100644 --- a/packaging/suse/amazon-ecs-init.changes +++ b/packaging/suse/amazon-ecs-init.changes @@ -1,4 +1,8 @@ ------------------------------------------------------------------- +Tue Apr 14, 18:00:00 UTC 2026 - amazon-ecs-bot@amazon.com - 1.999.99-1 + +- Cache Agent version 1.999.99 +------------------------------------------------------------------- Mon Mar 30, 17:00:00 UTC 2026 - amoghr@amazon.com - 1.102.2-1 - Cache Agent version 1.102.2 diff --git a/scripts/changelog/CHANGELOG_MASTER b/scripts/changelog/CHANGELOG_MASTER index 93d4e1a47a7..725e5627777 100644 --- a/scripts/changelog/CHANGELOG_MASTER +++ b/scripts/changelog/CHANGELOG_MASTER @@ -1,3 +1,8 @@ +1.999.99-1 +amazon-ecs-bot +2026-04-14T10:00:00-08:00 +Cache Agent version 1.999.99 + 1.102.2-1 Amogh Rathore 2026-03-30T10:00:00-07:00