test/e2e: add dockerfile-inputs

Author: Prucek

test/e2e/dockerfile-inputs/config.yaml

@@ -0,0 +1,35 @@
+base_images:
+  os:
+    name: ubi-minimal
+    namespace: ocp
+    tag: '9'
+build_root:
+  image_stream_tag:
+    namespace: ocp
+    name: ubi-minimal
+    tag: '9'
+resources:
+  '*':
+    requests:
+      cpu: 10m
+images:
+- dockerfile_path: testdata/Dockerfile.single
+  to: auto-detect-single
+- dockerfile_path: testdata/Dockerfile.multiple
+  to: auto-detect-multiple
+- dockerfile_path: testdata/Dockerfile.quay-proxy
+  to: auto-detect-quay-proxy
+- dockerfile_path: testdata/Dockerfile.manual
+  inputs:
+    os:
+      as:
+      - registry.ci.openshift.org/ocp/4.19:base
+  to: manual-inputs
+- dockerfile_path: testdata/Dockerfile.copy-from
+  to: auto-detect-copy-from
+- dockerfile_path: testdata/Dockerfile.no-refs
+  to: no-registry-refs
+zz_generated_metadata:
+  branch: main
+  org: openshift
+  repo: konflux-tasks

test/e2e/dockerfile-inputs/e2e_test.go

@@ -0,0 +1,90 @@
+//go:build e2e
+// +build e2e
+
+package dockerfile_inputs
+
+import (
+	"testing"
+
+	"github.com/openshift/ci-tools/test/e2e/framework"
+)
+
+func TestDockerfileInputs(t *testing.T) {
+	const defaultJobSpec = `{"type":"postsubmit","job":"branch-ci-test-test-master-dockerfile-inputs","buildid":"0","prowjobid":"uuid","refs":{"org":"test","repo":"test","base_ref":"master","base_sha":"6d231cc37652e85e0f0e25c21088b73d644d89ad","pulls":[]},"decoration_config":{"timeout":"4h0m0s","grace_period":"30m0s","utility_images":{"clonerefs":"quay-proxy.ci.openshift.org/openshift/ci:ci_clonerefs_latest","initupload":"quay-proxy.ci.openshift.org/openshift/ci:ci_initupload_latest","entrypoint":"quay-proxy.ci.openshift.org/openshift/ci:ci_entrypoint_latest","sidecar":"quay-proxy.ci.openshift.org/openshift/ci:ci_sidecar_latest"},"resources":{"clonerefs":{"limits":{"memory":"3Gi"},"requests":{"cpu":"100m","memory":"500Mi"}},"initupload":{"limits":{"memory":"200Mi"},"requests":{"cpu":"100m","memory":"50Mi"}},"place_entrypoint":{"limits":{"memory":"100Mi"},"requests":{"cpu":"100m","memory":"25Mi"}},"sidecar":{"limits":{"memory":"2Gi"},"requests":{"cpu":"100m","memory":"250Mi"}}},"gcs_configuration":{"bucket":"test-platform-results","path_strategy":"single","default_org":"openshift","default_repo":"origin","mediaTypes":{"log":"text/plain"}},"gcs_credentials_secret":"gce-sa-credentials-gcs-publisher"}}`
+
+	var testCases = []struct {
+		name    string
+		args    []string
+		success bool
+		output  []string
+	}{
+		{
+			name:    "auto-detect single registry.ci.openshift.org reference",
+			args:    []string{"--target=auto-detect-single"},
+			success: true,
+			output: []string{
+				"Dockerfile-inputs: Detected registry reference",
+				"registry.ci.openshift.org/ocp/4.19:base",
+			},
+		},
+		{
+			name:    "auto-detect multiple registry references",
+			args:    []string{"--target=auto-detect-multiple"},
+			success: true,
+			output: []string{
+				"Dockerfile-inputs: Detected registry reference",
+				"registry.ci.openshift.org/ocp/4.19:base",
+				"registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.19",
+			},
+		},
+		{
+			name:    "auto-detect with quay-proxy reference",
+			args:    []string{"--target=auto-detect-quay-proxy"},
+			success: true,
+			output: []string{
+				"Dockerfile-inputs: Detected registry reference",
+				"quay-proxy.ci.openshift.org/openshift/ci:ocp_builder_rhel-9-golang-1.22-openshift-4.19",
+			},
+		},
+		{
+			name:    "skip auto-detect when manual inputs.as defined",
+			args:    []string{"--target=manual-inputs"},
+			success: true,
+			output: []string{
+				"Skipping Dockerfile inputs detection: manual inputs defined",
+				"registry.ci.openshift.org/ocp/4.19:base",
+			},
+		},
+		{
+			name:    "auto-detect with COPY --from reference",
+			args:    []string{"--target=auto-detect-copy-from"},
+			success: true,
+			output: []string{
+				"Dockerfile-inputs: Detected registry reference",
+				"registry.ci.openshift.org/ocp/4.19:base",
+			},
+		},
+		{
+			name:    "no auto-detect when no registry references",
+			args:    []string{"--target=no-registry-refs"},
+			success: true,
+			output:  []string{},
+		},
+	}
+
+	for _, testCase := range testCases {
+		testCase := testCase
+		framework.Run(t, testCase.name, func(t *framework.T, cmd *framework.CiOperatorCommand) {
+			cmd.AddArgs(framework.LocalPullSecretFlag(t), framework.RemotePullSecretFlag(t))
+			cmd.AddArgs(append(testCase.args, "--config=config.yaml")...)
+			cmd.AddEnv("JOB_SPEC=" + defaultJobSpec)
+			output, err := cmd.Run()
+			if testCase.success != (err == nil) {
+				t.Fatalf("%s: didn't expect an error from ci-operator: %v; output:\n%v", testCase.name, err, string(output))
+			}
+			if len(testCase.output) > 0 {
+				cmd.VerboseOutputContains(t, testCase.name, testCase.output...)
+			}
+		})
+	}
+}

test/e2e/dockerfile-inputs/testdata/Dockerfile.copy-from

@@ -0,0 +1,6 @@
+FROM alpine:latest AS stage1
+RUN echo "First stage"
+
+FROM registry.ci.openshift.org/ocp/4.19:base
+COPY --from=stage1 /etc/os-release /tmp/
+RUN echo "Testing COPY --from"

test/e2e/dockerfile-inputs/testdata/Dockerfile.manual

@@ -0,0 +1,2 @@
+FROM registry.ci.openshift.org/ocp/4.19:base
+RUN echo "This has manual inputs.as defined, should skip auto-detect"

test/e2e/dockerfile-inputs/testdata/Dockerfile.multiple

@@ -0,0 +1,6 @@
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.19 AS builder
+RUN echo "Build stage"
+
+FROM registry.ci.openshift.org/ocp/4.19:base
+COPY --from=builder /app /app
+RUN echo "Final stage"

test/e2e/dockerfile-inputs/testdata/Dockerfile.no-refs

@@ -0,0 +1,2 @@
+FROM alpine:latest
+RUN echo "No registry.ci.openshift.org references here"

test/e2e/dockerfile-inputs/testdata/Dockerfile.quay-proxy

@@ -0,0 +1,2 @@
+FROM quay-proxy.ci.openshift.org/openshift/ci:ocp_builder_rhel-9-golang-1.22-openshift-4.19
+RUN echo "Testing quay-proxy auto-detect"

test/e2e/dockerfile-inputs/testdata/Dockerfile.single

@@ -0,0 +1,2 @@
+FROM registry.ci.openshift.org/ocp/4.19:base
+RUN echo "Testing single auto-detect"