remove redundant test declarations

aws · May 31, 2022 · 861f585 · 861f585
1 parent 2d0c956
commit 861f585
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 60 deletions.
diff --git a/agent/credentials/instancecreds/instancecreds_unsupported.go b/agent/credentials/instancecreds/instancecreds_unsupported.go
@@ -1,4 +1,5 @@
 //go:build !linux && !windows
+// +build !linux,!windows
 
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 //

diff --git a/agent/credentials/providers/credentials_filename_unsupported.go b/agent/credentials/providers/credentials_filename_unsupported.go
@@ -1,4 +1,5 @@
 //go:build !linux && !windows
+// +build !linux,!windows
 
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 //

diff --git a/agent/taskresource/cgroup/control/init_linux_test.go b/agent/taskresource/cgroup/control/init_linux_test.go
diff --git a/packaging/generic-deb-integrated/debian/changelog b/packaging/generic-deb-integrated/debian/changelog
@@ -1,3 +1,24 @@
+amazon-ecs-init (1.61.1-1) stable; urgency=medium
+
+  * Cache Agent version 1.61.1
+  * Install script no longer fails on systems using cgroups v2
+  * Add GO111MODULE=on to honnef.co/go/tools/cmd/staticcheck
+
+ -- Anuj Singh <singholt@amazon.com>  Tue, 03 May 2022 18:00:00 +0000
+
+amazon-ecs-init (1.61.0-1) stable; urgency=medium
+
+  * Cache Agent version 1.61.0
+  * Check ipv4 routes for default network interface instead of defaulting to eth0
+
+ -- Cameron Sparr <cssparr@amazon.com>  Tue, 05 Apr 2022 18:00:00 +0000
+
+amazon-ecs-init (1.60.1-1) stable; urgency=medium
+
+  * Cache Agent version 1.60.1
+
+ -- Ray Allan <fierlion@amazon.com>  Wed, 23 Mar 2022 18:00:00 +0000
+
 amazon-ecs-init (1.60.0-1) stable; urgency=medium
 
   * Cache Agent version 1.60.0

diff --git 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.60.0
+Version:        1.61.1
 Release:        1
 License:        Apache 2.0
 Summary:        Amazon Elastic Container Service initialization application
@@ -95,6 +95,18 @@ ln -sf %{basename:%{agent_image}} %{_cachedir}/ecs/ecs-agent.tar
 %systemd_postun_with_restart amazon-ecs-volume-plugin
 
 %changelog
+* Tue May 03 2022 Anuj Singh <singholt@amazon.com> - 1.61.1-1
+- Cache Agent version 1.61.1
+- Install script no longer fails on systems using cgroups v2
+- Add GO111MODULE=on to honnef.co/go/tools/cmd/staticcheck
+
+* Tue Apr 05 2022 Cameron Sparr <cssparr@amazon.com> - 1.61.0-1
+- Cache Agent version 1.61.0
+- Check ipv4 routes for default network interface instead of defaulting to eth0
+
+* Wed Mar 23 2022 Ray Allan <fierlion@amazon.com> - 1.60.1-1
+- Cache Agent version 1.60.1
+
 * Wed Mar 02 2022 Chien Han Lin <chilinn@amazon.com> - 1.60.0-1
 - Cache Agent version 1.60.0
 - Add volume plugin to rpm/deb package

diff --git a/scripts/changelog/changelog.go b/scripts/changelog/changelog.go
@@ -18,10 +18,12 @@ type Change struct {
 const (
 	CHANGE_TEMPLATE  = "./CHANGELOG_MASTER"
 	TOP_LEVEL        = "../../CHANGELOG.md"
-	AMAZON_LINUX_RPM = "../../packaging/amazon-linux-ami/ecs-init.spec"
+	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"
 
 	AMAZON_LINUX_TIME_FMT = "Mon Jan 02 2006"
 	DEBIAN_TIME_FMT       = "Mon, 02 Jan 2006 15:04:05 -0700"
@@ -69,14 +71,15 @@ func main() {
 	rpmChangeString := getRPMChangeString(changeArray)
 	ubuntuChangeString := getUbuntuChangeString(changeArray)
 	suseChangeString := getSuseChangeString(changeArray)
-	topLevelChangeString := getTopLevelChangeString(changeArray)
+	//topLevelChangeString := getTopLevelChangeString(changeArray)
 
 	// update changelog files
-	rewriteChangelog(TOP_LEVEL, topLevelChangeString)
+	//rewriteChangelog(TOP_LEVEL, topLevelChangeString)
 	rewriteChangelog(UBUNTU, ubuntuChangeString)
+	rewriteChangelog(GENERIC_DEB_INT, ubuntuChangeString)
 	rewriteChangelog(SUSE, suseChangeString)
 
-	rpmSpecs := []string{AMAZON_LINUX_RPM, GENERIC_RPM}
+	rpmSpecs := []string{AMAZON_LINUX_RPM, 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.