- remove redundant regenerate code

Signed-off-by: arpechenin <[email protected]>

Author: arpechenin

backend/test/compiler/argo_ginkgo_test.go

@@ -15,17 +15,14 @@
 package compiler
 
 import (
-	"flag"
 	"fmt"
-	"github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
-	matcher "github.com/kubeflow/pipelines/backend/test/compiler/matchers"
 	"os"
 	"path/filepath"
-	"sigs.k8s.io/yaml"
 	"strings"
 
 	"github.com/kubeflow/pipelines/backend/src/apiserver/config/proxy"
 	"github.com/kubeflow/pipelines/backend/src/v2/compiler/argocompiler"
+	matcher "github.com/kubeflow/pipelines/backend/test/compiler/matchers"
 	workflowutils "github.com/kubeflow/pipelines/backend/test/compiler/utils"
 	. "github.com/kubeflow/pipelines/backend/test/constants"
 	"github.com/kubeflow/pipelines/backend/test/logger"
@@ -35,8 +32,6 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var regenerateAllSkipTests = flag.Bool("regenerate", false, "Regenerate all compiled workflow and skip tests")
-
 var _ = BeforeEach(func() {
 	logger.Log("Initializing proxy config...")
 	proxy.InitializeConfigWithEmptyForTests()
@@ -72,26 +67,10 @@ var _ = Describe("Verify Spec Compilation to Workflow >", Label(POSITIVE, WORKFL
 				fileNameWithoutExtension := strings.TrimSuffix(pipelineSpecFileName, fileExtension)
 				compiledWorkflowFileName := fileNameWithoutExtension + ".yaml"
 				compiledWorkflowFilePath := filepath.Join(argoYAMLDir, compiledWorkflowFileName)
-
-				if *regenerateAllSkipTests {
-					pipelineSpecs, platformSpec := workflowutils.LoadPipelineSpecsFromIR(
-						pipelineSpecFilePath,
-						param.compilerOptions.CacheDisabled,
-						nil,
-					)
-					regeneratedWf := workflowutils.GetCompiledArgoWorkflow(pipelineSpecs, platformSpec, &param.compilerOptions)
-					err := RegenerateSpec(compiledWorkflowFilePath, *regeneratedWf)
-					if err != nil {
-						Fail(fmt.Sprintf("Critical error: %v", err))
-					}
-					continue
-				}
 				It(fmt.Sprintf("When I compile %s pipeline spec, then the compiled yaml should be %s", pipelineSpecFileName, compiledWorkflowFileName), func() {
 					test_utils.CheckIfSkipping(pipelineSpecFileName)
-
 					pipelineSpecs, platformSpec := workflowutils.LoadPipelineSpecsFromIR(pipelineSpecFilePath, param.compilerOptions.CacheDisabled, nil)
 					compiledWorkflow := workflowutils.GetCompiledArgoWorkflow(pipelineSpecs, platformSpec, &param.compilerOptions)
-
 					if *createMissingGoldenFiles || *updateGoldenFiles {
 						configuredWorkflow := workflowutils.ConfigureCacheSettings(compiledWorkflow, true)
 						_, err := os.Stat(compiledWorkflowFilePath)
@@ -103,7 +82,6 @@ var _ = Describe("Verify Spec Compilation to Workflow >", Label(POSITIVE, WORKFL
 						}
 					}
 					expectedWorkflow := workflowutils.UnmarshallWorkflowYAML(compiledWorkflowFilePath)
-
 					if param.compilerOptions.CacheDisabled {
 						expectedWorkflow = workflowutils.ConfigureCacheSettings(expectedWorkflow, false)
 					}
@@ -129,23 +107,3 @@ var _ = Describe("Verify Spec Compilation to Workflow >", Label(POSITIVE, WORKFL
 		})
 	}
 })
-
-func RegenerateSpec(path string, wf v1alpha1.Workflow) error {
-	wfYml, _ := yaml.Marshal(wf)
-	wfYmlStr := string(wfYml)
-	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
-	if err != nil {
-		return err
-	}
-	var wfLines []string
-	for _, line := range strings.Split(wfYmlStr, "\n") {
-		if !strings.Contains(line, "- --cache_disabled") {
-			wfLines = append(wfLines, line)
-		}
-	}
-	_, err = file.WriteString(strings.Join(wfLines, "\n"))
-	if err != nil {
-		return err
-	}
-	return nil
-}

backend/test/compiler/matchers/workflow_matcher.go

@@ -129,7 +129,7 @@ func CompareWorkflows(actual *v1alpha1.Workflow, expected *v1alpha1.Workflow) {
 		gomega.Expect(actual.Spec.Templates[index].HTTP).To(gomega.Equal(template.HTTP), "HTTP is not same")
 		gomega.Expect(actual.Spec.Templates[index].Memoize).To(gomega.Equal(template.Memoize), "Memoize is not same")
 		gomega.Expect(actual.Spec.Templates[index].Metadata).To(gomega.Equal(template.Metadata), "Metadata is not same")
-		//		gomega.Expect(actual.Spec.Templates[index].Plugin).To(gomega.Equal(template.Plugin), "Plugin is not same")
+		gomega.Expect(actual.Spec.Templates[index].Plugin).To(gomega.Equal(template.Plugin), "Plugin is not same")
 		gomega.Expect(actual.Spec.Templates[index].PriorityClassName).To(gomega.Equal(template.PriorityClassName), "PriorityClassName is not same")
 		gomega.Expect(actual.Spec.Templates[index].Resource).To(gomega.Equal(template.Resource), "Resource is not same")
 		gomega.Expect(actual.Spec.Templates[index].Script).To(gomega.Equal(template.Script), "Script is not same")