Skip to content

Commit ae1eaad

Browse files
authored
Use non-hermetic maven build (#2153)
* WIP: Use non-hermetic maven build * Remove deps build steps
1 parent 8d7fb50 commit ae1eaad

File tree

7 files changed

+9
-95
lines changed

7 files changed

+9
-95
lines changed

.tekton/docker-java-build.yaml

Lines changed: 1 addition & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -116,83 +116,6 @@ spec:
116116
name: CHAINS-GIT_COMMIT
117117
value: $(tasks.clone-repository.results.commit)
118118
tasks:
119-
- matrix:
120-
params:
121-
- name: PLATFORM
122-
value:
123-
- $(params.build-platforms)
124-
name: build-images-deps
125-
params:
126-
- name: IMAGE
127-
value: $(params.output-image)-deps
128-
- name: DOCKERFILE
129-
value: $(params.dockerfile).deps
130-
- name: CONTEXT
131-
value: $(params.path-context)
132-
- name: HERMETIC
133-
value: "false"
134-
- name: PREFETCH_INPUT
135-
value: $(params.prefetch-input)
136-
- name: IMAGE_EXPIRES_AFTER
137-
value: $(params.image-expires-after)
138-
- name: COMMIT_SHA
139-
value: $(tasks.clone-repository.results.commit)
140-
- name: BUILD_ARGS
141-
value:
142-
- $(params.build-args[*])
143-
- name: BUILD_ARGS_FILE
144-
value: $(params.build-args-file)
145-
- name: SOURCE_ARTIFACT
146-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
147-
- name: CACHI2_ARTIFACT
148-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
149-
- name: IMAGE_APPEND_PLATFORM
150-
value: "true"
151-
runAfter:
152-
- prefetch-dependencies
153-
taskRef:
154-
params:
155-
- name: name
156-
value: buildah-remote-oci-ta
157-
- name: bundle
158-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.6@sha256:3832edaec1aae546c225c86ada53611e42717c784e2068e0536831a99cb1922d
159-
- name: kind
160-
value: task
161-
resolver: bundles
162-
when:
163-
- input: $(tasks.init.results.build)
164-
operator: in
165-
values:
166-
- "true"
167-
- name: build-image-index-deps
168-
params:
169-
- name: IMAGE
170-
value: $(params.output-image)-deps
171-
- name: COMMIT_SHA
172-
value: $(tasks.clone-repository.results.commit)
173-
- name: IMAGE_EXPIRES_AFTER
174-
value: $(params.image-expires-after)
175-
- name: ALWAYS_BUILD_INDEX
176-
value: $(params.build-image-index)
177-
- name: IMAGES
178-
value:
179-
- $(tasks.build-images-deps.results.IMAGE_REF[*])
180-
runAfter:
181-
- build-images-deps
182-
taskRef:
183-
params:
184-
- name: name
185-
value: build-image-index
186-
- name: bundle
187-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:d94cad7f41be61074dd21c7dff26dab9217c3435a16f62813c1cb8382dd9aae6
188-
- name: kind
189-
value: task
190-
resolver: bundles
191-
when:
192-
- input: $(tasks.init.results.build)
193-
operator: in
194-
values:
195-
- "true"
196119
- matrix:
197120
params:
198121
- name: PLATFORM
@@ -202,7 +125,6 @@ spec:
202125
params:
203126
- name: BUILD_ARGS
204127
value:
205-
- DEPS_IMAGE=$(tasks.build-image-index-deps.results.IMAGE_URL)@$(tasks.build-image-index-deps.results.IMAGE_DIGEST)
206128
- $(params.build-args[*])
207129
- name: IMAGE
208130
value: $(params.output-image)
@@ -233,7 +155,7 @@ spec:
233155
- name: IMAGE_APPEND_PLATFORM
234156
value: "true"
235157
runAfter:
236-
- build-image-index-deps
158+
- prefetch-dependencies
237159
taskRef:
238160
params:
239161
- name: name

.tekton/kn-ekb-dispatcher-117-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
- name: git-url
3333
value: '{{source_url}}'
3434
- name: hermetic
35-
value: "true"
35+
value: "false"
3636
- name: image-expires-after
3737
value: 5d
3838
- name: output-image

.tekton/kn-ekb-dispatcher-117-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
- name: git-url
3232
value: '{{source_url}}'
3333
- name: hermetic
34-
value: "true"
34+
value: "false"
3535
- name: output-image
3636
value: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137/kn-ekb-dispatcher:{{revision}}
3737
- name: revision

.tekton/kn-ekb-receiver-117-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
- name: git-url
3333
value: '{{source_url}}'
3434
- name: hermetic
35-
value: "true"
35+
value: "false"
3636
- name: image-expires-after
3737
value: 5d
3838
- name: output-image

.tekton/kn-ekb-receiver-117-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
- name: git-url
3232
value: '{{source_url}}'
3333
- name: hermetic
34-
value: "true"
34+
value: "false"
3535
- name: output-image
3636
value: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137/kn-ekb-receiver:{{revision}}
3737
- name: revision

openshift/ci-operator/static-images/dispatcher/hermetic/Dockerfile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,16 @@
1616

1717
ARG JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
1818
ARG JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
19-
ARG DEPS_IMAGE
20-
21-
FROM $DEPS_IMAGE AS deps
2219

2320
FROM $JAVA_BUILDER AS builder
2421

2522
USER root
2623

2724
WORKDIR /build
2825

29-
COPY --from=deps /third_party/maven/ /third_party/maven/
30-
3126
COPY /data-plane .
3227

33-
RUN mvn -Dmaven.repo.local=/third_party/maven --offline package -pl=dispatcher-loom -Drelease -am -DskipTests --no-transfer-progress
28+
RUN mvn package -pl=dispatcher-loom -Drelease -am -DskipTests --no-transfer-progress
3429

3530
RUN mkdir /app && cp /build/dispatcher-loom/target/dispatcher-loom-1.0-SNAPSHOT.jar /app/app.jar
3631

@@ -50,6 +45,7 @@ LABEL \
5045
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Dispatcher" \
5146
io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Dispatcher" \
5247
io.openshift.tags=dispatcher \
48+
vendor="Red Hat, Inc." \
5349
cpe="cpe:/a:redhat:openshift_serverless:1.37::el9"
5450

5551
COPY --from=builder /app /app

openshift/ci-operator/static-images/receiver/hermetic/Dockerfile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,16 @@
1616

1717
ARG JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
1818
ARG JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
19-
ARG DEPS_IMAGE
20-
21-
FROM $DEPS_IMAGE AS deps
2219

2320
FROM $JAVA_BUILDER AS builder
2421

2522
USER root
2623

2724
WORKDIR /build
2825

29-
COPY --from=deps /third_party/maven/ /third_party/maven/
30-
3126
COPY /data-plane .
3227

33-
RUN mvn -Dmaven.repo.local=/third_party/maven --offline package -pl=receiver-loom -Drelease -am -DskipTests --no-transfer-progress
28+
RUN mvn package -pl=receiver-loom -Drelease -am -DskipTests --no-transfer-progress
3429

3530
RUN mkdir /app && cp /build/receiver-loom/target/receiver-loom-1.0-SNAPSHOT.jar /app/app.jar
3631

@@ -50,6 +45,7 @@ LABEL \
5045
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Receiver" \
5146
io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Receiver" \
5247
io.openshift.tags=receiver \
48+
vendor="Red Hat, Inc." \
5349
cpe="cpe:/a:redhat:openshift_serverless:1.37::el9"
5450

5551
COPY --from=builder /app /app

0 commit comments

Comments
 (0)