Merge pull request #1466 from 14rcole/stoneintg-1464-implementation

feat(stoneintg-1464) create snapshots from componentgroups

Author: 14rcole

Makefile

@@ -131,7 +131,8 @@ run: manifests generate fmt vet ## Run a controller from your host.
 	go run ./cmd/main.go
 
 .PHONY: img-build
-img-build: test ## Build container image with the manager.
+#img-build: test ## Build container image with the manager.
+img-build:
 	$(CONT_ENGINE) build -t ${IMG} .
 
 .PHONY: img-push

api/v1beta2/componentgroup_types.go

@@ -135,6 +135,11 @@ type ComponentState struct {
 	// +optional
 	Version string `json:"version"`
 
+	// Git URL for the component. Needed by Release service. Can be used along
+	// with LastPromotedCommit to access the code that has been promoted
+	// +optional
+	URL string `json:"url"`
+
 	// Location of the last image for this Component to be promoted. If no
 	// image has been promoted then the field will be blank
 	// +optional
@@ -154,7 +159,8 @@ type ComponentState struct {
 // ComponentGroupStatus defines the observed state of ComponentGroup
 type ComponentGroupStatus struct {
 	// Conditions is an array of the ComponentGroup's status conditions
-	Conditions []metav1.Condition `json:"conditions"`
+	// +optional
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
 	// The list of recently promoted Components which the integration service
 	// uses to create Snapshots

config/crd/bases/appstudio.redhat.com_componentgroups.yaml

@@ -248,6 +248,11 @@ spec:
                     name:
                       description: Name of the Component
                       type: string
+                    url:
+                      description: |-
+                        Git URL for the component. Needed by Release service. Can be used along
+                        with LastPromotedCommit to access the code that has been promoted
+                      type: string
                     version:
                       description: |-
                         Version of the Component. Only required if multiple version of the same
@@ -257,8 +262,6 @@ spec:
                   - name
                   type: object
                 type: array
-            required:
-            - conditions
             type: object
         type: object
     served: true

gitops/snapshot.go

@@ -76,7 +76,7 @@ const (
 	// SnapshotTestScenarioLabel contains the name of the Snapshot test scenario.
 	SnapshotTestScenarioLabel = "test.appstudio.openshift.io/scenario"
 
-	// SnapshotTestScenarioLabel contains json data with test results of the particular snapshot
+	// SnapshotTestsStatusAnnotation contains json data with test results of the particular snapshot
 	SnapshotTestsStatusAnnotation = "test.appstudio.openshift.io/status"
 
 	// (Deprecated) SnapshotPRLastUpdate contains timestamp of last time PR was updated
@@ -133,6 +133,9 @@ const (
 	// ApplicationNameLabel contains the name of the application
 	ApplicationNameLabel = AppstudioLabelPrefix + "/application"
 
+	// ComponentGroupNameLabel contains the name of the ComponentGroup
+	ComponentGroupNameLabel = AppstudioLabelPrefix + "/component-group"
+
 	// SnapshotComponentType is the type of Snapshot which was created for a single component build.
 	SnapshotComponentType = "component"
 
@@ -227,10 +230,10 @@ const (
 	// GitRefBranchPrefix is the git prefix denoting a reference is a branch
 	GitRefBranchPrefix = "refs/heads/"
 
-	//AppStudioTestSucceededCondition is the condition for marking if the AppStudio Tests succeeded for the Snapshot.
+	// AppStudioTestSucceededCondition is the condition for marking if the AppStudio Tests succeeded for the Snapshot.
 	AppStudioTestSucceededCondition = "AppStudioTestSucceeded"
 
-	//LegacyTestSucceededCondition is the condition for marking if the AppStudio Tests succeeded for the Snapshot.
+	// LegacyTestSucceededCondition is the condition for marking if the AppStudio Tests succeeded for the Snapshot.
 	LegacyTestSucceededCondition = "HACBSStudioTestSucceeded"
 
 	// AppStudioIntegrationStatusCondition is the condition for marking the AppStudio integration status of the Snapshot.
@@ -244,7 +247,6 @@ const (
 
 	// SnapshotAddedToGlobalCandidateListCondition is the condition for marking if Snapshot's component was added to
 	// the global candidate list.
-	// Checking statusCondition has been replaced by checking annotation test.appstudio.openshift.io/added-to-global-candidate-list now but this statusCondition is still kept
 	SnapshotAddedToGlobalCandidateListCondition = "AddedToGlobalCandidateList"
 
 	// AppStudioTestSucceededConditionSatisfied is the reason that's set when the AppStudio tests succeed.
@@ -262,46 +264,46 @@ const (
 	// AppStudioIntegrationStatusErrorOccured is the reason that's set when the AppStudio integration gets into an error state.
 	AppStudioIntegrationStatusErrorOccured = "ErrorOccured"
 
-	//AppStudioIntegrationStatusInProgress is the reason that's set when the AppStudio tests gets into an in progress state.
+	// AppStudioIntegrationStatusInProgress is the reason that's set when the AppStudio tests gets into an in progress state.
 	AppStudioIntegrationStatusInProgress = "InProgress"
 
-	//AppStudioIntegrationStatusFinished is the reason that's set when the AppStudio tests finish.
+	// AppStudioIntegrationStatusFinished is the reason that's set when the AppStudio tests finish.
 	AppStudioIntegrationStatusFinished = "Finished"
 
-	//AppStudioIntegrationStatusCancelled is the reason that's set when the AppStudio tests pipelinerun gets cancelled.
+	// AppStudioIntegrationStatusCancelled is the reason that's set when the AppStudio tests pipelinerun gets cancelled.
 	AppStudioIntegrationStatusCancelled = "CancelledRunFinally"
 
-	// This annotation helps track PipelineRuns that were stopped before completion, enabling better auditability and observability.
+	// PRGroupCancelledAnnotation helps track PipelineRuns that were stopped before completion.
 	PRGroupCancelledAnnotation = PipelinesAsCodePrefix + "/cancelled"
 
-	// the statuses needed to report to GiHub when creating check run or commit status, see doc
-	// https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-checks?apiVersion=2022-11-28
-	// https://docs.github.com/en/free-pro-team@latest/rest/checks/runs?apiVersion=2022-11-28#create-a-check-run
-	//IntegrationTestStatusPendingGithub is the status reported to github when integration test is in a queue
+	// IntegrationTestStatusPendingGithub is the status reported to github when integration test is in a queue
 	IntegrationTestStatusPendingGithub = "pending"
 
-	//IntegrationTestStatusSuccessGithub is the status reported to github when integration test succeed
+	// IntegrationTestStatusSuccessGithub is the status reported to github when integration test succeed
 	IntegrationTestStatusSuccessGithub = "success"
 
-	//IntegrationTestStatusFailureGithub is the status reported to github when integration test fail
+	// IntegrationTestStatusFailureGithub is the status reported to github when integration test fail
 	IntegrationTestStatusFailureGithub = "failure"
 
-	//IntegrationTestStatusErrorGithub is the status reported to github when integration test experience error
+	// IntegrationTestStatusErrorGithub is the status reported to github when integration test experience error
 	IntegrationTestStatusErrorGithub = "error"
 
-	//IntegrationTestStatusInProgressGithub is the status reported to github when integration test is in progress
+	// IntegrationTestStatusInProgressGithub is the status reported to github when integration test is in progress
 	IntegrationTestStatusInProgressGithub = "in_progress"
 
-	//IntegrationTestStatusCancelledGithub is the status reported to github when integration test is cancelled
+	// IntegrationTestStatusCancelledGithub is the status reported to github when integration test is cancelled
 	IntegrationTestStatusCancelledGithub = "cancelled"
 
-	//IntegrationTestStatusNeutralGithub is the status reported to github when integration test is neutral
+	// IntegrationTestStatusNeutralGithub is the status reported to github when integration test is neutral
 	IntegrationTestStatusNeutralGithub = "neutral"
 
+	// ComponentNameForGroupSnapshot is the component name used for group snapshots
 	ComponentNameForGroupSnapshot = "pr group"
 
+	// FailedToCreateGroupSnapshotMsg is the message when group snapshot creation fails
 	FailedToCreateGroupSnapshotMsg = "Failed to create group snapshot for pr group"
 
+	// GroupSnapshotCreationFailureReported is the message when group snapshot creation failure is reported to git provider
 	GroupSnapshotCreationFailureReported = "group snapshot creation failure is reported to git provider"
 
 	// Annotation that tells the integration service to skip checks for whether a build or snapshot is superseded
@@ -310,18 +312,11 @@ const (
 	// PRStatusMerged indicates that the PR has been merged
 	PRStatusMerged = "merged"
 
+	// Success is the success status value
 	Success = "Success"
-	// AddedToGlobalCandidateListAnnotation is the annotation for marking if Snapshot/build PLR's component was added to
-	// the global candidate list.
-	AddedToGlobalCandidateListAnnotation = "test.appstudio.openshift.io/added-to-global-candidate-list"
 
-	// maxPrefixLength is the maximum length of the prefix for the snapshot name
-	// When a suffix is used for collision handling, reduce by 3 to accommodate the 2-char suffix and extra dash
-	// Format: {prefix}-{YYYYMMDD}-{HHMMSS}-{mmm}[-{suffix}]
-	// Without suffix: 43 + 1 + 8 + 1 + 6 + 1 + 3 = 63 chars
-	// With suffix: 40 + 1 + 8 + 1 + 6 + 1 + 3 + 1 + 2 = 63 chars
-	maxPrefixLength           = 43
-	maxPrefixLengthWithSuffix = 40 // 43 - 3 (2 for suffix + 1 for extra dash)
+	// AddedToGlobalCandidateListAnnotation is the annotation for marking if Snapshot/build PLR's component was added to the global candidate list.
+	AddedToGlobalCandidateListAnnotation = "test.appstudio.openshift.io/added-to-global-candidate-list"
 
 	// GitCommentPolicyAnnotation is the annotation to control git comment policy for the component
 	GitCommentPolicyAnnotation = "test.appstudio.openshift.io/comment_strategy"
@@ -334,6 +329,16 @@ var (
 	SnapshotComponentLabel = tektonconsts.ComponentNameLabel
 )
 
+const (
+	// maxPrefixLength is the maximum length of the prefix for the snapshot name
+	// When a suffix is used for collision handling, reduce by 3 to accommodate the 2-char suffix and extra dash
+	// Format: {prefix}-{YYYYMMDD}-{HHMMSS}-{mmm}[-{suffix}]
+	// Without suffix: 43 + 1 + 8 + 1 + 6 + 1 + 3 = 63 chars
+	// With suffix: 40 + 1 + 8 + 1 + 6 + 1 + 3 + 1 + 2 = 63 chars
+	maxPrefixLength           = 43
+	maxPrefixLengthWithSuffix = 40 // 43 - 3 (2 for suffix + 1 for extra dash)
+)
+
 // ComponentSnapshotInfo contains data about the component snapshots' info in group snapshot
 type ComponentSnapshotInfo struct {
 	// Namespace
@@ -827,7 +832,7 @@ func IsSnapshotCreatedByPACMergeQueueEvent(snapshot *applicationapiv1alpha1.Snap
 }
 
 // IsSnapshotCreatedByPACPushEvent checks if a snapshot has label PipelineAsCodeEventTypeLabel and with push value
-// it the label doesn't exist for some manual snapshot
+// if the label doesn't exist for some manual snapshot
 func IsSnapshotCreatedByPACPushEvent(snapshot *applicationapiv1alpha1.Snapshot) bool {
 	return !IsSnapshotCreatedByPACMergeQueueEvent(snapshot) && !IsGroupSnapshot(snapshot) &&
 		(metadata.HasLabelWithValue(snapshot, PipelineAsCodeEventTypeLabel, PipelineAsCodePushType) ||
@@ -1135,7 +1140,9 @@ func ResetSnapshotStatusConditions(ctx context.Context, adapterClient client.Cli
 
 // CopySnapshotLabelsAndAnnotations coppies labels and annotations from build pipelineRun or tested snapshot
 // into regular snapshot
-func CopySnapshotLabelsAndAnnotations(application *applicationapiv1alpha1.Application, snapshot *applicationapiv1alpha1.Snapshot, componentName string, source *metav1.ObjectMeta, prefixes []string) {
+// ObjectMeta: metav1.ObjectMeta{
+// TODO: replace 'object' with 'componentGroup' after application is deprecated. Also delete Application bool
+func CopySnapshotLabelsAndAnnotations(object *metav1.ObjectMeta, snapshot *applicationapiv1alpha1.Snapshot, componentName string, source *metav1.ObjectMeta, prefixes []string, objectIsApplication bool) {
 
 	if snapshot.Labels == nil {
 		snapshot.Labels = map[string]string{}
@@ -1147,7 +1154,12 @@ func CopySnapshotLabelsAndAnnotations(application *applicationapiv1alpha1.Applic
 	snapshot.Labels[SnapshotTypeLabel] = SnapshotComponentType
 
 	snapshot.Labels[SnapshotComponentLabel] = componentName
-	snapshot.Labels[ApplicationNameLabel] = application.Name
+	if objectIsApplication {
+		snapshot.Labels[ApplicationNameLabel] = object.Name
+	} else {
+		// the object is a ComponentGroup
+		snapshot.Labels[ComponentGroupNameLabel] = object.Name
+	}
 
 	// Copy PAC annotations/labels from source(tested snapshot or pipelinerun) to snapshot.
 	_ = metadata.CopyLabelsWithPrefixReplacement(source, &snapshot.ObjectMeta, "pipelinesascode.tekton.dev", PipelinesAsCodePrefix)

go.mod

@@ -4,7 +4,7 @@ go 1.25.0
 
 require (
 	codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v3 v3.0.0
-	github.com/konflux-ci/application-api v0.0.0-20260120144946-dc5c619fb3f9
+	github.com/konflux-ci/application-api v0.0.0-20260213151620-9ac61f5d7ca0
 	github.com/konflux-ci/coverport/instrumentation/go v0.0.0-20251127115143-b5207b335f8b
 	github.com/konflux-ci/operator-toolkit v0.0.0-20251118152634-b4f41f073069
 	github.com/konflux-ci/release-service v0.0.0-20260127184035-c36c56a3c440

go.sum

@@ -343,8 +343,8 @@ github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3J
 github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0=
 github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
 github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
-github.com/konflux-ci/application-api v0.0.0-20260120144946-dc5c619fb3f9 h1:B4WWEeSQziHKStmvb7kT041KF6yeKEmvYzjUUWBue9U=
-github.com/konflux-ci/application-api v0.0.0-20260120144946-dc5c619fb3f9/go.mod h1:948Z+a1IbfRT0RtoHzWWSN9YEucSbMJTHaMhz7dVICc=
+github.com/konflux-ci/application-api v0.0.0-20260213151620-9ac61f5d7ca0 h1:txe2MpWDtNi3EJpIk7JCjC2QKUOMJnJfLEjJGusc0ds=
+github.com/konflux-ci/application-api v0.0.0-20260213151620-9ac61f5d7ca0/go.mod h1:948Z+a1IbfRT0RtoHzWWSN9YEucSbMJTHaMhz7dVICc=
 github.com/konflux-ci/coverport/instrumentation/go v0.0.0-20251127115143-b5207b335f8b h1:NoriO1KRc+7d2/JA07JizqxP0LlA2oJdD5AuQOvEIjE=
 github.com/konflux-ci/coverport/instrumentation/go v0.0.0-20251127115143-b5207b335f8b/go.mod h1:WVMHU9A2464s/vjH1xOTm4LJDD4xP+VlEiU+KM0gkSU=
 github.com/konflux-ci/operator-toolkit v0.0.0-20251118152634-b4f41f073069 h1:nT8V7Bva2LclJhWahIQYSNiYRHcmB22H6v4DD/FD7QU=

helpers/component_group.go

@@ -0,0 +1,25 @@
+/*
+Copyright 2026 Red Hat Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package helpers
+
+import "github.com/konflux-ci/integration-service/api/v1beta2"
+
+func GetComponentGroupNames(componentGroups *[]v1beta2.ComponentGroup) []string {
+	names := []string{}
+	for _, componentGroup := range *componentGroups {
+		names = append(names, componentGroup.Name)
+	}
+	return names
+}