Merge pull request #3717 from saschagrunert/archive

Skip release archive

cmd/krel/cmd/announce_build.go

@@ -29,6 +29,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"sigs.k8s.io/release-utils/command"
+
+	"k8s.io/release/pkg/announce"
 )
 
 const (
@@ -240,7 +242,7 @@ func (opts *buildAnnounceOptions) saveAnnouncement(announcementSubject string, a
 		return fmt.Errorf("saving announcement.html: %w", err)
 	}
 
-	absOutputPath = filepath.Join(opts.workDir, "announcement-subject.txt")
+	absOutputPath = filepath.Join(opts.workDir, announce.SubjectFile)
 	logrus.Infof("Writing announcement subject to %s", absOutputPath)
 	err = os.WriteFile(absOutputPath, []byte(announcementSubject), os.FileMode(0o644))
 	if err != nil {

cmd/krel/cmd/announce_send.go

@@ -117,7 +117,7 @@ func runAnnounce(opts *sendAnnounceOptions, announceRootOpts *announceOptions, r
 
 	tag := util.AddTagPrefix(announceRootOpts.tag)
 	u := fmt.Sprintf(
-		"%s/archive/anago-%s/announcement.html",
+		"%s/release/%s/announcement.html",
 		release.URLPrefixForBucket(release.ProductionBucket), tag,
 	)
 	logrus.Infof("Using announcement remote URL: %s", u)

cmd/krel/cmd/sign_blobs.go

@@ -196,7 +196,7 @@ func runSignBlobs(signOpts *signOptions, signBlobOpts *signBlobOptions, args []s
 		}
 	}
 
-	t := throttler.New(int(signOpts.maxWorkers), len(bundle)) //nolint:gosec // overlow is highly unlikely
+	t := throttler.New(int(signOpts.maxWorkers), len(bundle)) //nolint:gosec // overflow is highly unlikely
 	for _, fileBundle := range bundle {
 		go func(fileBundle signingBundle) {
 			logrus.Infof("Signing %s...", fileBundle.fileToSign)

pkg/anago/anago.go

@@ -29,6 +29,7 @@ import (
 	"sigs.k8s.io/release-utils/util"
 	"sigs.k8s.io/release-utils/version"
 
+	"k8s.io/release/pkg/announce"
 	"k8s.io/release/pkg/release"
 )
 
@@ -51,6 +52,12 @@ const (
 	// releaseNotesJSONFile is the file containing the release notes in json format.
 	releaseNotesJSONFile = workspaceDir + "/src/release-notes.json"
 
+	// announcementHTMLFile is the file containing the release announcement in HTML format.
+	announcementHTMLFile = workspaceDir + "/src/" + announce.AnnouncementFile
+
+	// announcementSubjectFile is the file containing the release announcement subject.
+	announcementSubjectFile = workspaceDir + "/src/" + announce.SubjectFile
+
 	// The default license for all artifacts.
 	LicenseIdentifier = "Apache-2.0"
 )
@@ -395,7 +402,7 @@ func (r *Release) Run() error {
 		return fmt.Errorf("init log file: %w", err)
 	}
 
-	logger := log.NewStepLogger(12)
+	logger := log.NewStepLogger(11)
 	v := version.GetVersionInfo()
 	logger.Infof("Using krel version: %s", v.GitVersion)
 
@@ -431,6 +438,11 @@ func (r *Release) Run() error {
 		logrus.Warnf("Unable to check provenance attestation: %v", err)
 	}
 
+	logger.WithStep().Info("Creating announcement")
+	if err := r.client.CreateAnnouncement(); err != nil {
+		return fmt.Errorf("create announcement: %w", err)
+	}
+
 	logger.WithStep().Info("Pushing artifacts")
 	if err := r.client.PushArtifacts(); err != nil {
 		return fmt.Errorf("push artifacts: %w", err)
@@ -441,21 +453,11 @@ func (r *Release) Run() error {
 		return fmt.Errorf("push git objects: %w", err)
 	}
 
-	logger.WithStep().Info("Creating announcement")
-	if err := r.client.CreateAnnouncement(); err != nil {
-		return fmt.Errorf("create announcement: %w", err)
-	}
-
 	logger.WithStep().Info("Updating GitHub release page")
 	if err := r.client.UpdateGitHubPage(); err != nil {
 		return fmt.Errorf("updating github page: %w", err)
 	}
 
-	logger.WithStep().Info("Archiving release")
-	if err := r.client.Archive(); err != nil {
-		return fmt.Errorf("archive release: %w", err)
-	}
-
 	logger.Info("Release done")
 	return nil
 }

pkg/anago/anago_test.go

@@ -46,6 +46,7 @@ func mockGenerateReleaseVersionRelease(mock *anagofakes.FakeReleaseClient) {
 	mock.GenerateReleaseVersionReturns(nil)
 }
 
+//nolint:dupl // duplications in those tests are intentional
 func TestRunStage(t *testing.T) {
 	for _, tc := range []struct {
 		prepare     func(*anagofakes.FakeStageClient)
@@ -131,6 +132,7 @@ func TestRunStage(t *testing.T) {
 	}
 }
 
+//nolint:dupl // duplications in those tests are intentional
 func TestRunRelease(t *testing.T) {
 	for _, tc := range []struct {
 		prepare     func(*anagofakes.FakeReleaseClient)
@@ -200,13 +202,6 @@ func TestRunRelease(t *testing.T) {
 			},
 			shouldError: true,
 		},
-		{ // Archive fails
-			prepare: func(mock *anagofakes.FakeReleaseClient) {
-				mockGenerateReleaseVersionRelease(mock)
-				mock.ArchiveReturns(err)
-			},
-			shouldError: true,
-		},
 	} {
 		opts := anago.DefaultReleaseOptions()
 		sut := anago.NewRelease(opts)