Change the extract dir to be constant

pkg/inflator/cli/app_test.go

@@ -12,7 +12,8 @@ import (
 
 func TestApp(t *testing.T) {
 	tmpdir := t.TempDir()
-	t.Setenv(extract.ArtifactsEnvVar, tmpdir)
+	t.Setenv(extract.HackScriptsDirEnvVar, tmpdir)
+	t.Setenv(cli.ManualVerboseEnvVar, "true")
 	c := cli.App{}.Command()
 	var (
 		outb bytes.Buffer
@@ -24,6 +25,6 @@ func TestApp(t *testing.T) {
 	err := c.Execute()
 
 	require.NoError(t, err)
-	assert.Equal(t, outb.String(), tmpdir+"/hack-scripts/e2e-tests.sh\n")
+	assert.Equal(t, outb.String(), tmpdir+"/e2e-tests.sh\n")
 	assert.Equal(t, errb.String(), "")
 }

pkg/inflator/cli/flags.go

@@ -1,15 +1,33 @@
 package cli
 
 import (
+	"os"
+	"strings"
+
 	"github.com/spf13/cobra"
 )
 
+const (
+	// ManualVerboseEnvVar is the environment variable that can be set to disable
+	// automatic verbose mode on CI servers.
+	ManualVerboseEnvVar = "KNATIVE_HACK_SCRIPT_MANUAL_VERBOSE"
+)
+
 type flags struct {
 	verbose bool
 }
 
 func (f *flags) withFlags(c *cobra.Command) *cobra.Command {
 	fl := c.PersistentFlags()
-	fl.BoolVarP(&f.verbose, "verbose", "v", false, "Print verbose output on Stderr")
+	fl.BoolVarP(&f.verbose, "verbose", "v", isCiServer(), "Print verbose output on Stderr")
 	return c
 }
+
+func isCiServer() bool {
+	if strings.HasPrefix(strings.ToLower(os.Getenv(ManualVerboseEnvVar)), "t") {
+		return false
+	}
+	return os.Getenv("CI") != "" ||
+		os.Getenv("BUILD_ID") != "" ||
+		os.Getenv("PROW_JOB_ID") != ""
+}

pkg/inflator/extract/extract.go

@@ -11,9 +11,9 @@ import (
 )
 
 const (
-	// ArtifactsEnvVar is the name of the environment variable that points
-	// to ARTIFACTS directory.
-	ArtifactsEnvVar = "ARTIFACTS"
+	// HackScriptsDirEnvVar is the name of the environment variable that points
+	// to directory where knative-hack scripts will be extracted.
+	HackScriptsDirEnvVar = "KNATIVE_HACK_SCRIPTS_DIR"
 	// PermOwnerWrite is the permission bits for owner write.
 	PermOwnerWrite = 0o200
 	// PermAllExecutable is the permission bits for executable.
@@ -42,14 +42,10 @@ type Operation struct {
 // provide the file path to it.
 func (o Operation) Extract(prtr Printer) error {
 	l := logger{o.Verbose, prtr}
-	artifactsDir := os.Getenv(ArtifactsEnvVar)
-	if artifactsDir == "" {
-		var err error
-		if artifactsDir, err = os.MkdirTemp("", "knative.*"); err != nil {
-			return wrapErr(err, ErrBug)
-		}
+	hackRootDir := os.Getenv(HackScriptsDirEnvVar)
+	if hackRootDir == "" {
+		hackRootDir = path.Join(os.TempDir(), "knative", "hack", "scripts")
 	}
-	hackRootDir := path.Join(artifactsDir, "hack-scripts")
 	l.debugf("Extracting hack scripts to directory: %s", hackRootDir)
 	if err := copyDir(l, hack.Scripts, hackRootDir, "."); err != nil {
 		return err

pkg/inflator/extract/extract_test.go

@@ -13,35 +13,35 @@ import (
 
 func TestExtract(t *testing.T) {
 	tmpdir := t.TempDir()
-	t.Setenv(extract.ArtifactsEnvVar, tmpdir)
+	t.Setenv(extract.HackScriptsDirEnvVar, tmpdir)
 	op := extract.Operation{
 		ScriptName: "library.sh",
 		Verbose:    true,
 	}
 	prtr := &testPrinter{}
 	err := op.Extract(prtr)
 	require.NoError(t, err)
-	assert.Equal(t, prtr.out.String(), tmpdir+"/hack-scripts/library.sh\n")
+	assert.Equal(t, prtr.out.String(), tmpdir+"/library.sh\n")
 	assert.Equal(t,
-		`[hack] Extracting hack scripts to directory: /tmp/x/hack-scripts
+		`[hack] Extracting hack scripts to directory: /tmp/x
 [hack] codegen-library.sh               1 KiB +
 [hack] e2e-tests.sh                     6 KiB ++
 [hack] infra-library.sh                 5 KiB +
 [hack] library.sh                      33 KiB +++++++
 [hack] microbenchmarks.sh               2 KiB +
 [hack] performance-tests.sh             6 KiB ++
 [hack] presubmit-tests.sh              12 KiB +++
-[hack] release.sh                      26 KiB ++++++
+[hack] release.sh                      27 KiB ++++++
 [hack] shellcheck-presubmit.sh          1 KiB +
 `, strings.ReplaceAll(prtr.err.String(), tmpdir, "/tmp/x"))
 
 	// second time should be a no-op
 	prtr = &testPrinter{}
 	err = op.Extract(prtr)
 	require.NoError(t, err)
-	assert.Equal(t, prtr.out.String(), tmpdir+"/hack-scripts/library.sh\n")
+	assert.Equal(t, prtr.out.String(), tmpdir+"/library.sh\n")
 	assert.Equal(t,
-		`[hack] Extracting hack scripts to directory: /tmp/x/hack-scripts
+		`[hack] Extracting hack scripts to directory: /tmp/x
 [hack] codegen-library.sh             up-to-date
 [hack] e2e-tests.sh                   up-to-date
 [hack] infra-library.sh               up-to-date