Skip to content
Closed
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
17 changes: 11 additions & 6 deletions .github/workflows/create-release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -139,14 +137,21 @@ 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..."
git push --force --set-upstream origin "${BRANCH_NAME}"

- name: Create pull request
env:
GH_TOKEN: ${{ secrets.ECS_AGENT_WORKFLOW_SECRET }}
GH_TOKEN: ${{ steps.app-token.outputs.token }}
run: |
PR_BODY=$(cat <<EOF
### Summary
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.102.2
1.999.99
4 changes: 2 additions & 2 deletions agent/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion ecs-init/ECSVERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.102.2
1.999.99
2 changes: 1 addition & 1 deletion ecs-init/config/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
59 changes: 31 additions & 28 deletions packaging/amazon-linux-ami-integrated/ecs-agent.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -61,30 +61,22 @@ 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))
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))
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -228,20 +235,13 @@ 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))
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))
Expand Down Expand Up @@ -393,6 +393,9 @@ fi
%endif

%changelog
* Tue Apr 14 2026 amazon-ecs-bot <amazon-ecs-bot@amazon.com> - 1.999.99-1
- Cache Agent version 1.999.99

* Mon Mar 30 2026 Amogh Rathore <amoghr@amazon.com> - 1.102.2-1
- Cache Agent version 1.102.2

Expand Down
6 changes: 6 additions & 0 deletions packaging/generic-deb-integrated/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
amazon-ecs-init (1.999.99-1) stable; urgency=medium

* Cache Agent version 1.999.99

-- amazon-ecs-bot <amazon-ecs-bot@amazon.com> Tue, 14 Apr 2026 18:00:00 +0000

amazon-ecs-init (1.102.2-1) stable; urgency=medium

* Cache Agent version 1.102.2
Expand Down
5 changes: 4 additions & 1 deletion packaging/generic-rpm-integrated/amazon-ecs-init.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 <amazon-ecs-bot@amazon.com> - 1.999.99-1
- Cache Agent version 1.999.99

* Mon Mar 30 2026 Amogh Rathore <amoghr@amazon.com> - 1.102.2-1
- Cache Agent version 1.102.2

Expand Down
4 changes: 4 additions & 0 deletions packaging/suse/amazon-ecs-init.changes
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions scripts/changelog/CHANGELOG_MASTER
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
1.999.99-1
amazon-ecs-bot <amazon-ecs-bot@amazon.com>
2026-04-14T10:00:00-08:00
Cache Agent version 1.999.99

1.102.2-1
Amogh Rathore <amoghr@amazon.com>
2026-03-30T10:00:00-07:00
Expand Down
6 changes: 3 additions & 3 deletions scripts/generate-release-changelog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ set -e
OUTPUT_FILE="CHANGELOG.md"
REPO_OWNER="aws"
REPO_NAME="amazon-ecs-agent"
BASE_BRANCH="master"
DEV_BRANCH="dev"
BASE_BRANCH="origin/master"
DEV_BRANCH="origin/dev"
AGENT_VERSION=""

# Global arrays to store changelog entries by category
Expand Down Expand Up @@ -136,7 +136,7 @@ get_release_changes() {
local commits

# Exclude merge commits using --no-merges
commits=$(git log ${BASE_BRANCH}..${DEV_BRANCH} --no-merges --format=%H 2>/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"
Expand Down
Loading