From 230ae3b3d994efd8c8c9135f025eed91a6407c78 Mon Sep 17 00:00:00 2001 From: Karel Hala Date: Thu, 16 Jan 2025 10:17:24 +0100 Subject: [PATCH] Add build tool submodule --- .gitmodules | 3 ++ .tekton/api-frontend-pull-request.yaml | 63 +------------------------- .tekton/api-frontend-push.yaml | 63 +------------------------- build-tools | 1 + 4 files changed, 6 insertions(+), 124 deletions(-) create mode 100644 .gitmodules create mode 160000 build-tools diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..435e8f91 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "build-tools"] + path = build-tools + url = https://github.com/RedHatInsights/insights-frontend-builder-common.git diff --git a/.tekton/api-frontend-pull-request.yaml b/.tekton/api-frontend-pull-request.yaml index a52f9445..9bf6f7e6 100644 --- a/.tekton/api-frontend-pull-request.yaml +++ b/.tekton/api-frontend-pull-request.yaml @@ -19,7 +19,7 @@ metadata: spec: params: - name: dockerfile - value: ./Dockerfile + value: build-tools/Dockerfile - name: git-url value: '{{source_url}}' - name: image-expires-after @@ -231,66 +231,6 @@ spec: workspace: workspace - name: git-basic-auth workspace: git-auth - - name: parse-build-deploy-script - params: - - name: path-context - value: $(params.path-context) - taskRef: - resolver: git - params: - - name: url - value: https://github.com/RedHatInsights/konflux-consoledot-frontend-build - - name: revision - value: 6ca6bf7cbbe1dd25a5b8e50ebb832041533bf4b3 - - name: pathInRepo - value: tasks/parse-build-deploy-script/parse-build-deploy-script.yaml - workspaces: - - name: source - workspace: workspace - runAfter: - - clone-repository - - name: create-frontend-dockerfile - taskRef: - resolver: git - params: - - name: url - value: https://github.com/RedHatInsights/konflux-consoledot-frontend-build - - name: revision - value: 6ca6bf7cbbe1dd25a5b8e50ebb832041533bf4b3 - - name: pathInRepo - value: tasks/create-frontend-dockerfile/create-frontend-dockerfile.yaml - workspaces: - - name: source - workspace: workspace - params: - - name: path-context - value: $(params.path-context) - - name: component - value: $(tasks.parse-build-deploy-script.results.component) - - name: image - value: $(tasks.parse-build-deploy-script.results.image) - - name: node-build-version - value: $(tasks.parse-build-deploy-script.results.node-build-version) - - name: quay-expire-time - value: $(tasks.parse-build-deploy-script.results.quay-expire-time) - - name: npm-build-script - value: $(tasks.parse-build-deploy-script.results.npm-build-script) - - name: yarn-build-script - value: $(tasks.parse-build-deploy-script.results.yarn-build-script) - - name: route-path - value: $(tasks.parse-build-deploy-script.results.route-path) - - name: beta-route-path - value: $(tasks.parse-build-deploy-script.results.beta-route-path) - - name: preview-route-path - value: $(tasks.parse-build-deploy-script.results.preview-route-path) - - name: ci-root - value: $(tasks.parse-build-deploy-script.results.ci-root) - - name: server-name - value: $(tasks.parse-build-deploy-script.results.server-name) - - name: dist-folder - value: $(tasks.parse-build-deploy-script.results.dist-folder) - runAfter: - - parse-build-deploy-script - name: build-container params: - name: IMAGE @@ -311,7 +251,6 @@ spec: value: $(params.build-args-file) runAfter: - prefetch-dependencies - - create-frontend-dockerfile taskRef: params: - name: name diff --git a/.tekton/api-frontend-push.yaml b/.tekton/api-frontend-push.yaml index 155e4f80..00593a9e 100644 --- a/.tekton/api-frontend-push.yaml +++ b/.tekton/api-frontend-push.yaml @@ -18,7 +18,7 @@ metadata: spec: params: - name: dockerfile - value: ./Dockerfile + value: build-tools/Dockerfile - name: git-url value: '{{source_url}}' - name: output-image @@ -228,66 +228,6 @@ spec: workspace: workspace - name: git-basic-auth workspace: git-auth - - name: parse-build-deploy-script - params: - - name: path-context - value: $(params.path-context) - taskRef: - resolver: git - params: - - name: url - value: https://github.com/RedHatInsights/konflux-consoledot-frontend-build - - name: revision - value: 6ca6bf7cbbe1dd25a5b8e50ebb832041533bf4b3 - - name: pathInRepo - value: tasks/parse-build-deploy-script/parse-build-deploy-script.yaml - workspaces: - - name: source - workspace: workspace - runAfter: - - clone-repository - - name: create-frontend-dockerfile - taskRef: - resolver: git - params: - - name: url - value: https://github.com/RedHatInsights/konflux-consoledot-frontend-build - - name: revision - value: 6ca6bf7cbbe1dd25a5b8e50ebb832041533bf4b3 - - name: pathInRepo - value: tasks/create-frontend-dockerfile/create-frontend-dockerfile.yaml - workspaces: - - name: source - workspace: workspace - params: - - name: path-context - value: $(params.path-context) - - name: component - value: $(tasks.parse-build-deploy-script.results.component) - - name: image - value: $(tasks.parse-build-deploy-script.results.image) - - name: node-build-version - value: $(tasks.parse-build-deploy-script.results.node-build-version) - - name: quay-expire-time - value: $(tasks.parse-build-deploy-script.results.quay-expire-time) - - name: npm-build-script - value: $(tasks.parse-build-deploy-script.results.npm-build-script) - - name: yarn-build-script - value: $(tasks.parse-build-deploy-script.results.yarn-build-script) - - name: route-path - value: $(tasks.parse-build-deploy-script.results.route-path) - - name: beta-route-path - value: $(tasks.parse-build-deploy-script.results.beta-route-path) - - name: preview-route-path - value: $(tasks.parse-build-deploy-script.results.preview-route-path) - - name: ci-root - value: $(tasks.parse-build-deploy-script.results.ci-root) - - name: server-name - value: $(tasks.parse-build-deploy-script.results.server-name) - - name: dist-folder - value: $(tasks.parse-build-deploy-script.results.dist-folder) - runAfter: - - parse-build-deploy-script - name: build-container params: - name: IMAGE @@ -308,7 +248,6 @@ spec: value: $(params.build-args-file) runAfter: - prefetch-dependencies - - create-frontend-dockerfile taskRef: params: - name: name diff --git a/build-tools b/build-tools new file mode 160000 index 00000000..596e85a6 --- /dev/null +++ b/build-tools @@ -0,0 +1 @@ +Subproject commit 596e85a62094b621345d9b0a057c39d12368b7a9