Support for referencePolicy Source while importing release payload

Author: deepsm007

pkg/api/types.go

@@ -335,6 +335,8 @@ type Integration struct {
 	// IncludeBuiltImages determines if the release we assemble will include
 	// images built during the test itself.
 	IncludeBuiltImages bool `json:"include_built_images,omitempty"`
+	// ReferencePolicy is the policy to use when resolving references (Local or Source)
+	ReferencePolicy string `json:"reference_policy,omitempty"`
 }
 
 // ReleaseDescriptor holds common data for different types of release payloads
@@ -494,6 +496,14 @@ func (i *ImageStreamTagReference) ISTagName() string {
 	return fmt.Sprintf("%s/%s:%s", i.Namespace, i.Name, i.Tag)
 }
 
+// // ReferencePolicyTag defines the possible values for the reference policy.
+// type ReferencePolicyTag string
+
+// const (
+// 	ReferencePolicyLocal  ReferencePolicyTag = "Local"
+// 	ReferencePolicySource ReferencePolicyTag = "Source"
+// )
+
 // ReleaseTagConfiguration describes how a release is
 // assembled from release artifacts. A release image stream is a
 // single stream with multiple tags (openshift/origin-v3.9:control-plane),
@@ -511,6 +521,9 @@ type ReleaseTagConfiguration struct {
 	// IncludeBuiltImages determines if the release we assemble will include
 	// images built during the test itself.
 	IncludeBuiltImages bool `json:"include_built_images,omitempty"`
+
+	// ReferencePolicy is the policy to use when resolving references (Local or Source)
+	ReferencePolicy string `json:"reference_policy,omitempty"`
 }
 
 func (config ReleaseTagConfiguration) InputsName() string {

pkg/defaults/defaults.go

@@ -220,6 +220,7 @@ func fromConfig(
 						Namespace:          resolveConfig.Integration.Namespace,
 						Name:               resolveConfig.Integration.Name,
 						IncludeBuiltImages: resolveConfig.Integration.IncludeBuiltImages,
+						ReferencePolicy:    resolveConfig.Integration.ReferencePolicy,
 					}, config.Resources, podClient, jobSpec)
 					for _, s := range []api.Step{snapshot, assemble} {
 						buildSteps = append(buildSteps, s)

pkg/util/imagestreamtagwrapper/testdata/imagestream.yaml

@@ -31,7 +31,7 @@ spec:
     importPolicy: {}
     name: root
     referencePolicy:
-      type: Local
+      type: Source
 status:
   dockerImageRepository: docker-registry.default.svc:5000/ci-op-jpdy23wx/pipeline
   publicDockerImageRepository: registry.svc.ci.openshift.org/ci-op-jpdy23wx/pipeline

pkg/util/imagestreamtagwrapper/testdata/imagestreamtags.yaml

@@ -224,7 +224,7 @@ items:
       apiVersion: "1.0"
       kind: DockerImage
     dockerImageMetadataVersion: "1.0"
-    dockerImageReference: docker-registry.default.svc:5000/ci-op-jpdy23wx/pipeline@sha256:fd41b8b3efb8db1187ac231ca84863a8106880d049123d6eddfe21d7f751c627
+    dockerImageReference: docker.io/openshift/origin-release@sha256:fd41b8b3efb8db1187ac231ca84863a8106880d049123d6eddfe21d7f751c627
     metadata:
       annotations:
         image.openshift.io/dockerLayersOrder: ascending
@@ -252,7 +252,7 @@ items:
     importPolicy: {}
     name: root
     referencePolicy:
-      type: Local
+      type: Source
 - apiVersion: image.openshift.io/v1
   generation: 3
   image:

pkg/validation/release.go

@@ -71,6 +71,12 @@ func validateIntegration(fieldRoot, name string, integration api.Integration) []
 	if integration.IncludeBuiltImages && name != api.LatestReleaseName {
 		validationErrors = append(validationErrors, fmt.Errorf("%s: only the `latest` release can set `include_built_images`", fieldRoot))
 	}
+	if integration.ReferencePolicy == "" {
+		integration.ReferencePolicy = "Local" // Set default value
+	}
+	if integration.ReferencePolicy != "Local" && integration.ReferencePolicy != "Source" {
+		validationErrors = append(validationErrors, fmt.Errorf("%s.reference_policy: must be one of Local or Source or empty defaults to Local", fieldRoot))
+	}
 	return validationErrors
 }
 

pkg/validation/release_test.go

@@ -543,6 +543,49 @@ func TestValidateIntegration(t *testing.T) {
 				IncludeBuiltImages: true,
 			},
 		},
+		{
+			name:      "valid integration with local reference policy",
+			inputName: "latest",
+			input: api.Integration{
+				Name:               "4.8",
+				Namespace:          "ocp",
+				IncludeBuiltImages: true,
+				ReferencePolicy:    "Local",
+			},
+		},
+		{
+			name:      "valid integration with source reference policy",
+			inputName: "latest",
+			input: api.Integration{
+				Name:               "4.8",
+				Namespace:          "ocp",
+				IncludeBuiltImages: true,
+				ReferencePolicy:    "Source",
+			},
+		},
+		{
+			name:      "valid integration with empty reference policy setting to Local as default",
+			inputName: "latest",
+			input: api.Integration{
+				Name:               "4.8",
+				Namespace:          "ocp",
+				IncludeBuiltImages: true,
+				ReferencePolicy:    "",
+			},
+		},
+		{
+			name:      "invalid integration with reference policy",
+			inputName: "latest",
+			input: api.Integration{
+				Name:               "4.8",
+				Namespace:          "ocp",
+				IncludeBuiltImages: true,
+				ReferencePolicy:    "something",
+			},
+			output: []error{
+				errors.New("root.reference_policy: must be one of Local or Source or empty defaults to Local"),
+			},
+		},
 		{
 			name:      "invalid integration missing namespace",
 			inputName: "latest",

pkg/webreg/zz_generated.ci_operator_reference.go

@@ -479,6 +479,8 @@ const ciOperatorReferenceYaml = "# The list of base images describe\n" +
 	"        # all release artifacts not built in the current\n" +
 	"        # job are tagged from.\n" +
 	"        namespace: ' '\n" +
+	"        # ReferencePolicy is the policy to use when resolving references (Local or Source)\n" +
+	"        reference_policy: ' '\n" +
 	"      resolved_release_images_step:\n" +
 	"        # Candidate describes a candidate release payload\n" +
 	"        candidate:\n" +
@@ -500,6 +502,8 @@ const ciOperatorReferenceYaml = "# The list of base images describe\n" +
 	"            name: ' '\n" +
 	"            # Namespace is the namespace in which the integration stream lives.\n" +
 	"            namespace: ' '\n" +
+	"            # ReferencePolicy is the policy to use when resolving references (Local or Source)\n" +
+	"            reference_policy: ' '\n" +
 	"        name: ' '\n" +
 	"        # Prerelease describes a yet-to-be released payload\n" +
 	"        prerelease:\n" +
@@ -1328,6 +1332,8 @@ const ciOperatorReferenceYaml = "# The list of base images describe\n" +
 	"            name: ' '\n" +
 	"            # Namespace is the namespace in which the integration stream lives.\n" +
 	"            namespace: ' '\n" +
+	"            # ReferencePolicy is the policy to use when resolving references (Local or Source)\n" +
+	"            reference_policy: ' '\n" +
 	"        # Prerelease describes a yet-to-be released payload\n" +
 	"        prerelease:\n" +
 	"            # Architecture is the architecture for the product.\n" +
@@ -1399,6 +1405,8 @@ const ciOperatorReferenceYaml = "# The list of base images describe\n" +
 	"    # all release artifacts not built in the current\n" +
 	"    # job are tagged from.\n" +
 	"    namespace: ' '\n" +
+	"    # ReferencePolicy is the policy to use when resolving references (Local or Source)\n" +
+	"    reference_policy: ' '\n" +
 	"# TestBinaryBuildCommands will create a \"test-bin\" image based on \"src\" that\n" +
 	"# contains the output of this command. This allows reuse of binary artifacts\n" +
 	"# across other steps. If empty, no \"test-bin\" image will be created.\n" +