Skip to content
This repository was archived by the owner on Nov 28, 2025. It is now read-only.

Commit 322c34d

Browse files
committed
ci: Use shared frontend Dockerfile
1 parent 13722af commit 322c34d

File tree

4 files changed

+6
-262
lines changed

4 files changed

+6
-262
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "build-tools"]
2+
path = build-tools
3+
url = https://github.com/RedHatInsights/insights-frontend-builder-common.git

.tekton/provisioning-frontend-pull-request.yaml

Lines changed: 1 addition & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
- name: image-expires-after
2828
value: 5d
2929
- name: dockerfile
30-
value: Dockerfile
30+
value: build-tools/Dockerfile
3131
- name: path-context
3232
value: .
3333
pipelineSpec:
@@ -214,135 +214,6 @@ spec:
214214
workspace: git-auth
215215
- name: netrc
216216
workspace: netrc
217-
- name: parse-build-deploy-script
218-
params:
219-
- name: path-context
220-
value: $(params.path-context)
221-
taskRef:
222-
resolver: git
223-
params:
224-
- name: url
225-
value: https://github.com/RedHatInsights/konflux-consoledot-frontend-build
226-
- name: revision
227-
value: 2fcdfa9b4858ac941b50ad37317c4f9aaabf91b4
228-
- name: pathInRepo
229-
value: tasks/parse-build-deploy-script/parse-build-deploy-script.yaml
230-
workspaces:
231-
- name: source
232-
workspace: workspace
233-
runAfter:
234-
- clone-repository
235-
- name: create-frontend-dockerfile
236-
taskRef:
237-
resolver: git
238-
params:
239-
- name: url
240-
value: https://github.com/RedHatInsights/konflux-consoledot-frontend-build
241-
- name: revision
242-
value: 2fcdfa9b4858ac941b50ad37317c4f9aaabf91b4
243-
- name: pathInRepo
244-
value: tasks/create-frontend-dockerfile/create-frontend-dockerfile.yaml
245-
workspaces:
246-
- name: source
247-
workspace: workspace
248-
params:
249-
- name: path-context
250-
value: $(params.path-context)
251-
- name: component
252-
value: $(tasks.parse-build-deploy-script.results.component)
253-
- name: image
254-
value: $(tasks.parse-build-deploy-script.results.image)
255-
- name: node-build-version
256-
value: $(tasks.parse-build-deploy-script.results.node-build-version)
257-
- name: quay-expire-time
258-
value: $(tasks.parse-build-deploy-script.results.quay-expire-time)
259-
- name: npm-build-script
260-
value: $(tasks.parse-build-deploy-script.results.npm-build-script)
261-
- name: yarn-build-script
262-
value: $(tasks.parse-build-deploy-script.results.yarn-build-script)
263-
- name: route-path
264-
value: $(tasks.parse-build-deploy-script.results.route-path)
265-
- name: beta-route-path
266-
value: $(tasks.parse-build-deploy-script.results.beta-route-path)
267-
- name: preview-route-path
268-
value: $(tasks.parse-build-deploy-script.results.preview-route-path)
269-
- name: ci-root
270-
value: $(tasks.parse-build-deploy-script.results.ci-root)
271-
- name: server-name
272-
value: $(tasks.parse-build-deploy-script.results.server-name)
273-
- name: dist-folder
274-
value: $(tasks.parse-build-deploy-script.results.dist-folder)
275-
runAfter:
276-
- parse-build-deploy-script
277-
- name: clone-repository-oci-ta
278-
params:
279-
- name: url
280-
value: $(params.git-url)
281-
- name: revision
282-
value: $(params.revision)
283-
- name: ociStorage
284-
value: $(params.output-image).git
285-
runAfter:
286-
- init
287-
taskRef:
288-
params:
289-
- name: name
290-
value: git-clone-oci-ta
291-
- name: bundle
292-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta@sha256:0f4360ce144d46171ebd2e8f4d4575539a0600e02208ba5fc9beeb2c27ddfd4c
293-
- name: kind
294-
value: task
295-
resolver: bundles
296-
when:
297-
- input: $(tasks.init.results.build)
298-
operator: in
299-
values:
300-
- "true"
301-
workspaces:
302-
- name: basic-auth
303-
workspace: git-auth
304-
# - name: run-unit-tests
305-
# description: Validates frontend unit tests
306-
# params:
307-
# - name: SOURCE_ARTIFACT
308-
# value: $(tasks.clone-repository-oci-ta.results.SOURCE_ARTIFACT)
309-
# runAfter:
310-
# - clone-repository-oci-ta
311-
# workspaces:
312-
# - name: basic-auth
313-
# workspace: git-auth
314-
# taskSpec:
315-
# params:
316-
# - description: The Trusted Artifact URI pointing to the artifact with the application source code.
317-
# name: SOURCE_ARTIFACT
318-
# type: string
319-
# volumes:
320-
# # New volume to store a copy of the source code accessible only to this Task.
321-
# - name: workdir
322-
# emptyDir: {}
323-
# stepTemplate:
324-
# volumeMounts:
325-
# - mountPath: /var/workdir
326-
# name: workdir
327-
# readOnly: false
328-
# sidecars:
329-
# steps:
330-
# - name: use-trusted-artifact
331-
# image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:8391272c4e5011120e9e7fee2c1f339e9405366110bf239dadcbc21e953ce099
332-
# args:
333-
# - use
334-
# - $(params.SOURCE_ARTIFACT)=/var/workdir
335-
# - image: registry.access.redhat.com/ubi8/nodejs-20
336-
# workingDir: /var/workdir
337-
# name: unit-tests
338-
# securityContext:
339-
# runAsUser: 0
340-
# script: |
341-
# #!/bin/bash
342-
# set -ex
343-
344-
# npm install
345-
# npm test
346217
- name: build-container
347218
params:
348219
- name: IMAGE
@@ -366,7 +237,6 @@ spec:
366237
value: $(params.build-args-file)
367238
runAfter:
368239
- prefetch-dependencies
369-
- create-frontend-dockerfile
370240
taskRef:
371241
params:
372242
- name: name

.tekton/provisioning-frontend-push.yaml

Lines changed: 1 addition & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
- name: output-image
2525
value: quay.io/redhat-user-workloads/insights-management-tenant/insights-provisioning/provisioning-frontend:{{revision}}
2626
- name: dockerfile
27-
value: Dockerfile
27+
value: build-tools/Dockerfile
2828
- name: path-context
2929
value: .
3030
pipelineSpec:
@@ -211,135 +211,6 @@ spec:
211211
workspace: git-auth
212212
- name: netrc
213213
workspace: netrc
214-
- name: parse-build-deploy-script
215-
params:
216-
- name: path-context
217-
value: $(params.path-context)
218-
taskRef:
219-
resolver: git
220-
params:
221-
- name: url
222-
value: https://github.com/RedHatInsights/konflux-consoledot-frontend-build
223-
- name: revision
224-
value: 2fcdfa9b4858ac941b50ad37317c4f9aaabf91b4
225-
- name: pathInRepo
226-
value: tasks/parse-build-deploy-script/parse-build-deploy-script.yaml
227-
workspaces:
228-
- name: source
229-
workspace: workspace
230-
runAfter:
231-
- clone-repository
232-
- name: create-frontend-dockerfile
233-
taskRef:
234-
resolver: git
235-
params:
236-
- name: url
237-
value: https://github.com/RedHatInsights/konflux-consoledot-frontend-build
238-
- name: revision
239-
value: 2fcdfa9b4858ac941b50ad37317c4f9aaabf91b4
240-
- name: pathInRepo
241-
value: tasks/create-frontend-dockerfile/create-frontend-dockerfile.yaml
242-
workspaces:
243-
- name: source
244-
workspace: workspace
245-
params:
246-
- name: path-context
247-
value: $(params.path-context)
248-
- name: component
249-
value: $(tasks.parse-build-deploy-script.results.component)
250-
- name: image
251-
value: $(tasks.parse-build-deploy-script.results.image)
252-
- name: node-build-version
253-
value: $(tasks.parse-build-deploy-script.results.node-build-version)
254-
- name: quay-expire-time
255-
value: $(tasks.parse-build-deploy-script.results.quay-expire-time)
256-
- name: npm-build-script
257-
value: $(tasks.parse-build-deploy-script.results.npm-build-script)
258-
- name: yarn-build-script
259-
value: $(tasks.parse-build-deploy-script.results.yarn-build-script)
260-
- name: route-path
261-
value: $(tasks.parse-build-deploy-script.results.route-path)
262-
- name: beta-route-path
263-
value: $(tasks.parse-build-deploy-script.results.beta-route-path)
264-
- name: preview-route-path
265-
value: $(tasks.parse-build-deploy-script.results.preview-route-path)
266-
- name: ci-root
267-
value: $(tasks.parse-build-deploy-script.results.ci-root)
268-
- name: server-name
269-
value: $(tasks.parse-build-deploy-script.results.server-name)
270-
- name: dist-folder
271-
value: $(tasks.parse-build-deploy-script.results.dist-folder)
272-
runAfter:
273-
- parse-build-deploy-script
274-
- name: clone-repository-oci-ta
275-
params:
276-
- name: url
277-
value: $(params.git-url)
278-
- name: revision
279-
value: $(params.revision)
280-
- name: ociStorage
281-
value: $(params.output-image).git
282-
runAfter:
283-
- init
284-
taskRef:
285-
params:
286-
- name: name
287-
value: git-clone-oci-ta
288-
- name: bundle
289-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta@sha256:0f4360ce144d46171ebd2e8f4d4575539a0600e02208ba5fc9beeb2c27ddfd4c
290-
- name: kind
291-
value: task
292-
resolver: bundles
293-
when:
294-
- input: $(tasks.init.results.build)
295-
operator: in
296-
values:
297-
- "true"
298-
workspaces:
299-
- name: basic-auth
300-
workspace: git-auth
301-
# - name: run-unit-tests
302-
# description: Validates frontend unit tests
303-
# params:
304-
# - name: SOURCE_ARTIFACT
305-
# value: $(tasks.clone-repository-oci-ta.results.SOURCE_ARTIFACT)
306-
# runAfter:
307-
# - clone-repository-oci-ta
308-
# workspaces:
309-
# - name: basic-auth
310-
# workspace: git-auth
311-
# taskSpec:
312-
# params:
313-
# - description: The Trusted Artifact URI pointing to the artifact with the application source code.
314-
# name: SOURCE_ARTIFACT
315-
# type: string
316-
# volumes:
317-
# # New volume to store a copy of the source code accessible only to this Task.
318-
# - name: workdir
319-
# emptyDir: {}
320-
# stepTemplate:
321-
# volumeMounts:
322-
# - mountPath: /var/workdir
323-
# name: workdir
324-
# readOnly: false
325-
# sidecars:
326-
# steps:
327-
# - name: use-trusted-artifact
328-
# image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:8391272c4e5011120e9e7fee2c1f339e9405366110bf239dadcbc21e953ce099
329-
# args:
330-
# - use
331-
# - $(params.SOURCE_ARTIFACT)=/var/workdir
332-
# - image: registry.access.redhat.com/ubi8/nodejs-20
333-
# workingDir: /var/workdir
334-
# name: unit-tests
335-
# securityContext:
336-
# runAsUser: 0
337-
# script: |
338-
# #!/bin/bash
339-
# set -ex
340-
341-
# npm install
342-
# npm test
343214
- name: build-container
344215
params:
345216
- name: IMAGE
@@ -363,7 +234,6 @@ spec:
363234
value: $(params.build-args-file)
364235
runAfter:
365236
- prefetch-dependencies
366-
- create-frontend-dockerfile
367237
taskRef:
368238
params:
369239
- name: name

build-tools

Submodule build-tools added at 3fad2bd

0 commit comments

Comments
 (0)