refactor(RELEASE-920): release pipeline tests use new tag format (kon…

…flux-ci#1176) This commit refactors the release pipeline tests to use the new tag format and remove the old one. Signed-off-by: Johnny Bieren <[email protected]>
johnbieren · Jun 11, 2024 · b886f12 · b886f12
1 parent c7eaad7
commit b886f12
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/tests/release/pipelines/rh_advisories.go b/tests/release/pipelines/rh_advisories.go
@@ -246,6 +246,8 @@ func createADVSReleasePlanAdmission(advsRPAName string, managedFw framework.Fram
 				{
 					"name":       component.GetName(),
 					"repository": "quay.io/redhat-pending/rhtap----konflux-release-e2e",
+					"tags": []string{"latest", "latest-{{ timestamp }}", "testtag",
+						"testtag-{{ timestamp }}", "testtag2", "testtag2-{{ timestamp }}"},
 				},
 			},
 		},
@@ -261,13 +263,6 @@ func createADVSReleasePlanAdmission(advsRPAName string, managedFw framework.Fram
 			"product_version": "v1.0",
 			"type":            "RHSA",
 		},
-		"images": map[string]interface{}{
-			"defaultTag":      "latest",
-			"addGitShaTag":    false,
-			"addTimestampTag": false,
-			"addSourceShaTag": false,
-			"floatingTags":    []string{"testtag", "testtag2"},
-		},
 		"sign": map[string]interface{}{
 			"configMapName": "hacbs-signing-pipeline-config-redhatbeta2",
 		},

diff --git a/tests/release/pipelines/rh_push_to_redhat_io.go b/tests/release/pipelines/rh_push_to_redhat_io.go
@@ -239,20 +239,15 @@ func createRHIOReleasePlanAdmission(rhioRPAName string, managedFw framework.Fram
 				{
 					"name":       testComponent.GetName(),
 					"repository": "quay.io/redhat-pending/rhtap----konflux-release-e2e",
+					"tags": []string{"latest", "latest-{{ timestamp }}", "testtag",
+						"testtag-{{ timestamp }}", "testtag2", "testtag2-{{ timestamp }}"},
 				},
 			},
 		},
 		"pyxis": map[string]interface{}{
 			"server": "stage",
 			"secret": "pyxis",
 		},
-		"images": map[string]interface{}{
-			"defaultTag":      "latest",
-			"addGitShaTag":    false,
-			"addTimestampTag": false,
-			"addSourceShaTag": false,
-			"floatingTags":    []string{"testtag", "testtag2"},
-		},
 		"fileUpdates": []map[string]interface{}{
 			{
 				"repo":          releasecommon.GitLabRunFileUpdatesTestRepo,