Remove build-pipeline-selectore related changes

konflux-ci · Jun 10, 2024 · a5ce27b · a5ce27b
1 parent 04c146b
commit a5ce27b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 124 deletions.
diff --git a/.tekton/pull-request.yaml b/.tekton/pull-request.yaml
@@ -139,6 +139,11 @@ spec:
               type: string
             - name: e2e_test_namespace
               type: string
+          results:
+          - name: custom-docker-build-bundle
+            description: "custom bundle for docker-build pipeline"
+          - name: custom-fbc-builder-bundle
+            description: "custom bundle for fbc-builder pipeline"
           steps:
             - name: build-bundles
               image: quay.io/konflux-ci/pull-request-builds:appstudio-utils-{{revision}}
@@ -152,6 +157,8 @@ spec:
                 INSTALL_BUNDLE_NS=$(params.e2e_test_namespace) \
                 ENABLE_SOURCE_BUILD=1 \
                 hack/build-and-push.sh
+                echo -n $CUSTOM_DOCKER_BUILD_PIPELINE_BUNDLE | tee $(results.custom-docker-build-bundle.path)
+                echo -n $CUSTOM_FBC_BUILDER_PIPELINE_BUNDLE | tee $(results.custom-fbc-builder-bundle.path)
           workspaces:
             - name: source
       - name: e2e-tests
@@ -164,6 +171,10 @@ spec:
             value: "{{ source_url }}"
           - name: ec_pipelines_repo_revision
             value: "{{ revision }}"
+          - name: docker-build-bundle
+            value: "$(tasks.build-bundles.results.custom-docker-build-bundle)"
+          - name: fbc-builder-bundle
+            value: "$(tasks.build-bundles.results.custom-fbc-builder-bundle)"
         runAfter:
           - build-bundles
         taskRef:

diff --git a/.tekton/tasks/e2e-test.yaml b/.tekton/tasks/e2e-test.yaml
@@ -20,9 +20,13 @@ spec:
       type: string
     - name: ec_pipelines_repo_revision
       type: string
+    - name: docker-build-bundle
+      type: string
+    - name: fbc-builder-bundle
+      type: string
   steps:
     - name: e2e-test
-      image: quay.io/redhat-appstudio/e2e-tests:bf19763689bec49c3169fe1ca5e704789ea48f56
+      image: quay.io/susdas/e2e:next
       # a la infra-deployment updates, when PRs merge in e2e-tests, PRs will be opened
       # against build-definitions to update this tag
       args: [
@@ -38,7 +42,7 @@ spec:
       - name: APP_SUFFIX
         value: "$(params.app_suffix)"
       - name: COMPONENT_REPO_URLS
-        value: "https://github.com/redhat-appstudio-qe/devfile-sample-python-basic,https://github.com/redhat-appstudio-qe/retrodep,https://github.com/cachito-testing/pip-e2e-test,https://github.com/redhat-appstudio-qe/fbc-sample-repo,https://github.com/redhat-appstudio-qe/nodejs-no-dockerfile,https://github.com/redhat-appstudio-qe/maven-hello-world"
+        value: "https://github.com/redhat-appstudio-qe/devfile-sample-python-basic,https://github.com/redhat-appstudio-qe/retrodep,https://github.com/cachito-testing/pip-e2e-test,https://github.com/redhat-appstudio-qe/fbc-sample-repo"
       - name: QUAY_E2E_ORGANIZATION
         value: redhat-appstudio
       - name: E2E_APPLICATIONS_NAMESPACE
@@ -59,3 +63,7 @@ spec:
         value: $(params.ec_pipelines_repo_url)
       - name: EC_PIPELINES_REPO_REVISION
         value: $(params.ec_pipelines_repo_revision)
+      - name: CUSTOM_DOCKER_BUILD_PIPELINE_BUNDLE
+        value: "$(params.docker-build-bundle)"
+      - name: CUSTOM_FBC_BUILDER_PIPELINE_BUNDLE
+        value: "$(params.fbc-builder-bundle)"
diff --git a/hack/build-and-push.sh b/hack/build-and-push.sh
@@ -182,5 +182,6 @@ do
 done
 
 if [ "$SKIP_INSTALL" == "" ]; then
-    "$SCRIPTDIR/util-install-bundle.sh" "$docker_pipeline_bundle,$fbc_pipeline_bundle,$nodejs_pipeline_bundle,$java_pipeline_bundle" "$INSTALL_BUNDLE_NS"
+    CUSTOM_DOCKER_BUILD_PIPELINE_BUNDLE="$docker_pipeline_bundle"
+    CUSTOM_FBC_BUILDER_PIPELINE_BUNDLE="$fbc_pipeline_bundle"
 fi
diff --git a/hack/util-install-bundle.sh b/hack/util-install-bundle.sh