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.

Sign up for GitHub

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

Update changelog generation script to add amazon-linux-ami-integrated #3356

Merged
merged 1 commit into from
Aug 25, 2022
Merged

Update changelog generation script to add amazon-linux-ami-integrated #3356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions packaging/amazon-linux-ami-integrated/ecs-agent.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,9 @@ fi
* Wed Jun 15 2022 Mythri Garaga Manjunatha <[email protected]> - 1.61.3-1
- Cache Agent version 1.61.3

* Wed Jun 01 2022 Utsa Bhattacharjya <[email protected]> - 1.61.2-1
- Cache Agent version 1.61.2

* Tue May 03 2022 Anuj Singh <[email protected]> - 1.61.1-1
- Cache Agent version 1.61.1
- Install script no longer fails on systems using cgroups v2
Expand Down Expand Up @@ -737,3 +740,4 @@ fi

* Mon Dec 15 2014 Samuel Karp <[email protected]> - 0.2-1
- Naive update functionality

4 changes: 4 additions & 0 deletions packaging/amazon-linux-ami/ecs-agent.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,9 @@ fi
* Wed Jun 15 2022 Mythri Garaga Manjunatha <[email protected]> - 1.61.3-1
- Cache Agent version 1.61.3

* Wed Jun 01 2022 Utsa Bhattacharjya <[email protected]> - 1.61.2-1
- Cache Agent version 1.61.2

* Tue May 03 2022 Anuj Singh <[email protected]> - 1.61.1-1
- Cache Agent version 1.61.1
- Install script no longer fails on systems using cgroups v2
Expand Down Expand Up @@ -744,3 +747,4 @@ fi

* Mon Dec 15 2014 Samuel Karp <[email protected]> - 0.2-1
- Naive update functionality

6 changes: 6 additions & 0 deletions packaging/generic-deb-integrated/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ amazon-ecs-init (1.61.3-1) stable; urgency=medium

-- Mythri Garaga Manjunatha <[email protected]> Wed, 15 Jun 2022 18:00:00 +0000

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

* Cache Agent version 1.61.2

-- Utsa Bhattacharjya <[email protected]> Wed, 01 Jun 2022 18:00:00 +0000

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

* Cache Agent version 1.61.1
Expand Down
6 changes: 6 additions & 0 deletions packaging/generic-deb/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ amazon-ecs-init (1.61.3-1) stable; urgency=medium

-- Mythri Garaga Manjunatha <[email protected]> Wed, 15 Jun 2022 18:00:00 +0000

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

* Cache Agent version 1.61.2

-- Utsa Bhattacharjya <[email protected]> Wed, 01 Jun 2022 18:00:00 +0000

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

* Cache Agent version 1.61.1
Expand Down
4 changes: 4 additions & 0 deletions packaging/generic-rpm-integrated/amazon-ecs-init.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ ln -sf %{basename:%{agent_image}} %{_cachedir}/ecs/ecs-agent.tar
* Wed Jun 15 2022 Mythri Garaga Manjunatha <[email protected]> - 1.61.3-1
- Cache Agent version 1.61.3

* Wed Jun 01 2022 Utsa Bhattacharjya <[email protected]> - 1.61.2-1
- Cache Agent version 1.61.2

* Tue May 03 2022 Anuj Singh <[email protected]> - 1.61.1-1
- Cache Agent version 1.61.1
- Install script no longer fails on systems using cgroups v2
Expand Down Expand Up @@ -560,3 +563,4 @@ ln -sf %{basename:%{agent_image}} %{_cachedir}/ecs/ecs-agent.tar

* Mon Dec 15 2014 Samuel Karp <[email protected]> - 0.2-1
- Naive update functionality

4 changes: 4 additions & 0 deletions packaging/generic-rpm/amazon-ecs-init.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ ln -sf %{basename:%{agent_image}} %{_cachedir}/ecs/ecs-agent.tar
* Wed Jun 15 2022 Mythri Garaga Manjunatha <[email protected]> - 1.61.3-1
- Cache Agent version 1.61.3

* Wed Jun 01 2022 Utsa Bhattacharjya <[email protected]> - 1.61.2-1
- Cache Agent version 1.61.2

* Tue May 03 2022 Anuj Singh <[email protected]> - 1.61.1-1
- Cache Agent version 1.61.1
- Install script no longer fails on systems using cgroups v2
Expand Down Expand Up @@ -570,3 +573,4 @@ ln -sf %{basename:%{agent_image}} %{_cachedir}/ecs/ecs-agent.tar

* Mon Dec 15 2014 Samuel Karp <[email protected]> - 0.2-1
- Naive update functionality

4 changes: 4 additions & 0 deletions packaging/suse/amazon-ecs-init.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ Wed Jun 15, 18:00:00 UTC 2022 - [email protected] - 1.61.3-1

- Cache Agent version 1.61.3
-------------------------------------------------------------------
Wed Jun 01, 18:00:00 UTC 2022 - [email protected] - 1.61.2-1

- Cache Agent version 1.61.2
-------------------------------------------------------------------
Tue May 03, 18:00:00 UTC 2022 - [email protected] - 1.61.1-1

- Cache Agent version 1.61.1
Expand Down
19 changes: 10 additions & 9 deletions scripts/changelog/changelog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ type Change struct {
}

const (
CHANGE_TEMPLATE = "./CHANGELOG_MASTER"
TOP_LEVEL = "../../CHANGELOG.md"
AMAZON_LINUX_RPM = "../../packaging/amazon-linux-ami/ecs-agent.spec"
GENERIC_RPM = "../../packaging/generic-rpm/amazon-ecs-init.spec"
GENERIC_RPM_INT = "../../packaging/generic-rpm-integrated/amazon-ecs-init.spec"
SUSE = "../../packaging/suse/amazon-ecs-init.changes"
UBUNTU = "../../packaging/generic-deb/debian/changelog"
GENERIC_DEB_INT = "../../packaging/generic-deb-integrated/debian/changelog"
CHANGE_TEMPLATE = "./CHANGELOG_MASTER"
TOP_LEVEL = "../../CHANGELOG.md"
AMAZON_LINUX_RPM = "../../packaging/amazon-linux-ami/ecs-agent.spec"
AMAZON_LINUX_RPM_INT = "../../packaging/amazon-linux-ami-integrated/ecs-agent.spec"
GENERIC_RPM = "../../packaging/generic-rpm/amazon-ecs-init.spec"
GENERIC_RPM_INT = "../../packaging/generic-rpm-integrated/amazon-ecs-init.spec"
SUSE = "../../packaging/suse/amazon-ecs-init.changes"
UBUNTU = "../../packaging/generic-deb/debian/changelog"
GENERIC_DEB_INT = "../../packaging/generic-deb-integrated/debian/changelog"

AMAZON_LINUX_TIME_FMT = "Mon Jan 02 2006"
DEBIAN_TIME_FMT = "Mon, 02 Jan 2006 15:04:05 -0700"
Expand Down Expand Up @@ -79,7 +80,7 @@ func main() {
rewriteChangelog(GENERIC_DEB_INT, ubuntuChangeString)
rewriteChangelog(SUSE, suseChangeString)

rpmSpecs := []string{AMAZON_LINUX_RPM, GENERIC_RPM, GENERIC_RPM_INT}
rpmSpecs := []string{AMAZON_LINUX_RPM, AMAZON_LINUX_RPM_INT, GENERIC_RPM, GENERIC_RPM_INT}
for _, spec := range rpmSpecs {
// Get everything before the %changelog section, so that the change logs
// in rpmChangeString are appended after it.
Expand Down