diff --git a/tools/eksDistroBuildToolingOpsTools/pkg/constants/constants.go b/tools/eksDistroBuildToolingOpsTools/pkg/constants/constants.go index a6c538eb4..d5fbe8e97 100644 --- a/tools/eksDistroBuildToolingOpsTools/pkg/constants/constants.go +++ b/tools/eksDistroBuildToolingOpsTools/pkg/constants/constants.go @@ -23,7 +23,8 @@ const ( EksGoAmdBuildUrl = "https://prow.eks.amazonaws.com/badge.svg?jobs=golang-%d-%d-tooling-postsubmit" EksGoArmBuildUrl = "https://prow.eks.amazonaws.com/badge.svg?jobs=golang-%d-%d-ARM64-PROD-tooling-postsubmit" EksGoSupportedVersionsPath = "projects/golang/go/MAINTAINED_EOL_VERSIONS" - EksGoArtifactUrl = "https://distro.eks.amazonaws.com/golang-go%d.%d.%d/release/%d/%s/%s/%s" + EksGoArtifactUrl = "https://distro.eks.amazonaws.com/golang-go%d.%d.%d/releases/%d/%s/%s/%s" EksGoTargzArtifactFmt = "go%d.%d.%d.linux-%s.tar.gz" EksGoRpmArtifactFmt = "golang-%d.%d.%d-%d.amzn2.eks.%s.rpm" + EksGoNoarchRpmArtifactFmt = "golang-src-%d.%d.%d-%d.amzn2.eks.%s.rpm" ) diff --git a/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/eksGoRelease.go b/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/eksGoRelease.go index a1b0a16b7..6458b6877 100644 --- a/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/eksGoRelease.go +++ b/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/eksGoRelease.go @@ -86,7 +86,7 @@ func (r Release) EksGoArtifacts(arch string) (string, string, string) { artifact = fmt.Sprintf(constants.EksGoRpmArtifactFmt, r.Major, r.Minor, r.Patch, r.Release, arch) urlFmt = fmt.Sprintf(constants.EksGoArtifactUrl, r.Major, r.Minor, r.Patch, r.Release, arch, "RPMS", arch) case "noarch": - artifact = fmt.Sprintf(constants.EksGoRpmArtifactFmt, r.MajorVersion(), r.MinorVersion(), r.PatchVersion(), r.ReleaseNumber(), arch) + artifact = fmt.Sprintf(constants.EksGoNoarchRpmArtifactFmt, r.MajorVersion(), r.MinorVersion(), r.PatchVersion(), r.ReleaseNumber(), arch) urlFmt = fmt.Sprintf(constants.EksGoArtifactUrl, r.Major, r.Minor, r.Patch, r.Release, "x86_64", "RPMS", arch) case "amd64", "arm64": artifact = fmt.Sprintf(constants.EksGoTargzArtifactFmt, r.Major, r.Minor, r.Patch, arch) diff --git a/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/githubRelease.go b/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/githubRelease.go index 6f6eeee41..7082fc40f 100644 --- a/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/githubRelease.go +++ b/tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/githubRelease.go @@ -21,7 +21,7 @@ const ( patchesPathFmt = "%s/%s/patches/%s" rpmSourcePathFmt = "%s/%s/rpmbuild/SOURCES/%s" specPathFmt = "%s/%s/rpmbuild/SPECS/%s" - readmeFmtPath = "tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/readmeFmt.txt" + readmeFmtPath = "tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/versionReadmeFmt.txt" newReleaseFile = "tools/eksDistroBuildToolingOpsTools/pkg/eksGoRelease/newRelease.txt" fedoraFile = "fedora.go" gdbinitFile = "golang-gdbinit"