add generic fetcher changes

.tekton/bazel-pull-request.yaml

@@ -31,7 +31,7 @@ spec:
   - name: path-context
     value: .
   - name: prefetch-input
-    value: rpm
+    value: [{"path": ".", "type": "rpm"}, {"path": ".", "type": "generic"}]
   pipelineSpec:
     description: |
       This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.
@@ -81,7 +81,7 @@ spec:
       description: Skip checks against built image
       name: skip-checks
       type: string
-    - default: "false"
+    - default: "true"
       description: Execute the build with network isolation
       name: hermetic
       type: string
@@ -188,7 +188,7 @@ spec:
         - name: name
           value: prefetch-dependencies-oci-ta
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.1@sha256:621b13ab4a01a366a2b1d8403cf06b2b7418afd926d13678c4432858514407d3
+          value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.1@sha256:3c11f5de6a0281bf93857f0c85bbbdfeda4cc118337da273fef0c138bda5eebb
         - name: kind
           value: task
         resolver: bundles
@@ -229,7 +229,7 @@ spec:
         - name: name
           value: buildah-oci-ta
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.2@sha256:2a0c67ea7d5d82b4ec47930c12397f94b3af0b3855d8e5ad9f6e088c93e42bf0
+          value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.2@sha256:d695d2236a84321fda426f9bec962efc3a0c0ff8d929b6ac8d412d9e42e6d213
         - name: kind
           value: task
         resolver: bundles

.tekton/bazel-push.yaml

@@ -28,7 +28,7 @@ spec:
   - name: path-context
     value: .
   - name: prefetch-input
-    value: rpm
+    value: [{"path": ".", "type": "rpm"}, {"path": ".", "type": "generic"}]
   taskRunSpecs:
     - pipelineTaskName: build-container
       stepSpecs:

WORKSPACE

@@ -28,19 +28,16 @@ http_archive(
 # invalid escape sequence error to be raised, which can't be avoided with
 # the --incompatible_restrict_string_escapes=false flag (flag was removed in
 # Bazel 5.0).
+
 RULES_FOREIGN_CC_VERSION = "0.9.0"
 http_archive(
-    name = "rules_foreign_cc",
-    sha256 = "2a4d07cd64b0719b39a7c12218a3e507672b82a97b98c6a89d38565894cf7c51",
-    strip_prefix = "rules_foreign_cc-%s" % RULES_FOREIGN_CC_VERSION,
-    url = "https://github.com/bazelbuild/rules_foreign_cc/archive/refs/tags/%s.tar.gz" % RULES_FOREIGN_CC_VERSION,
-    patch_tool = "patch",
-    patches = ["//ml_metadata/third_party:rules_foreign_cc.patch",],
+   name = "rules_foreign_cc",
+   sha256 = "2a4d07cd64b0719b39a7c12218a3e507672b82a97b98c6a89d38565894cf7c51",
+   urls = [
+      "https://github.com/bazel-contrib/rules_foreign_cc/archive/refs/tags/0.9.0.tar.gz"
+   ],
 )
-
-load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
-rules_foreign_cc_dependencies()
-
+
 http_archive(
     name = "com_google_absl",
     sha256 = "59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5",

generic_lockfile.yaml

@@ -0,0 +1,84 @@
+metadata:
+  version: "1.0"
+artifacts:
+  - name: "postgresql"
+    download_url: "https://ftp.postgresql.org/pub/source/v12.17/postgresql-12.17.tar.gz"
+    checksums:
+      sha256: "1cb8e3a59861be5175878159fc3a41240c379e9aabaabba8288e6cfd6980fff0"
+  - name: "bazel_platforms"
+    download_url: "https://github.com/bazelbuild/platforms/releases/download/0.0.6/platforms-0.0.6.tar.gz"
+    checksums:
+      sha256: "5308fc1d8865406a49427ba24a9ab53087f17f5266a7aabbfc28823f3916e1ca"
+  - name: "rules_foreign_cc"
+    download_url: "https://github.com/bazel-contrib/rules_foreign_cc/archive/refs/tags/0.9.0.tar.gz"
+    checksums:
+      sha256: "2a4d07cd64b0719b39a7c12218a3e507672b82a97b98c6a89d38565894cf7c51"
+  - name: "abseil_cpp"
+    download_url: "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.0.tar.gz"
+    checksums:
+      sha256: "59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5"
+  - name: "boringssl"
+    download_url: "https://github.com/google/boringssl/archive/68dcc7f7b816e199c8f373ea0a2d6a4e1f526e2d.tar.gz"
+    checksums:
+      sha256: "f69738ca17f1dd30ae3ddb1fa7519245044737d27c8a3defa7a94718d9dfd724"
+  - name: "org_sqlite"
+    download_url: "https://www.sqlite.org/2022/sqlite-amalgamation-3390200.zip"
+    checksums:
+      sha256: "87775784f8b22d0d0f1d7811870d39feaa7896319c7c20b849a4181c5a50609b"
+  - name: "com_google_googletest"
+    download_url: "https://github.com/google/googletest/archive/b6cd405286ed8635ece71c72f118e659f4ade3fb.zip"
+    checksums:
+      sha256: "ff7a82736e158c077e76188232eac77913a15dac0b22508c390ab3f88e6d6d86"
+  - name: "com_google_glog"
+    download_url: "https://github.com/google/glog/archive/96a2f23dca4cc7180821ca5f32e526314395d26a.zip"
+    checksums:
+      sha256: "6281aa4eeecb9e932d7091f99872e7b26fa6aacece49c15ce5b14af2b7ec050f"
+  - name: "bazel_skylib"
+    download_url: "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz"
+    checksums:
+      sha256: "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44"
+  - name: "six_archive"
+    download_url: "https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz"
+    checksums:
+      sha256: "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a"
+  - name: "zlib"
+    download_url: "https://github.com/madler/zlib/releases/download/v1.3/zlib-1.3.tar.gz"
+    checksums:
+      sha256: "ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e"
+  - name: "pybind11_bazel"
+    download_url: "https://github.com/pybind/pybind11_bazel/archive/faf56fb3df11287f26dbc66fdedf60a2fc2c6631.tar.gz"
+    checksums:
+      sha256: "a2b107b06ffe1049696e132d39987d80e24d73b131d87f1af581c2cb271232f8"
+  - name: "pybind11"
+    download_url: "https://github.com/pybind/pybind11/archive/v2.10.1.tar.gz"
+    checksums: 
+      sha256: "111014b516b625083bef701df7880f78c2243835abdb263065b6b59b960b6bad"
+  - name: "com_googlesource_code_re2"
+    download_url: "https://github.com/google/re2/archive/03da4fc0857c285e3a26782f6bc8931c4c950df4.tar.gz"
+    checksums:
+      sha256: "ef516fb84824a597c4d5d0d6d330daedb18363b5a99eda87d027e6bdd9cba299"
+  - name: "com_github_grpc_grpc"
+    download_url: "https://github.com/grpc/grpc/archive/v1.46.3.tar.gz"
+    checksums:
+      sha256: "d6cbf22cb5007af71b61c6be316a79397469c58c82a942552a62e708bce60964"
+  - name: "io_bazel_rules_go"
+    download_url: "https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz"
+    checksums:
+      sha256: "d0833bc6dad817a367936a5f902a0c11318160b5e80a20ece35fb85a5675c886"
+  - name: "bazel_gazelle"
+    download_url: "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.19.1/bazel-gazelle-v0.19.1.tar.gz"
+    checksums:
+      sha256: "86c6d481b3f7aedc1d60c1c211c6f76da282ae197c3b3160f54bd3a8f847896f"
+  - name: "com_github_gflags_gflags"
+    download_url: "https://github.com/gflags/gflags/archive/a738fdf9338412f83ab3f26f31ac11ed3f3ec4bd.zip"
+    checksums:
+      sha256: "017e0a91531bfc45be9eaf07e4d8fed33c488b90b58509dbd2e33a33b2648ae6"
+  - name: "com_google_zetasql"
+    download_url: "https://github.com/google/zetasql/archive/refs/tags/2024.08.2.tar.gz"
+    checksums:
+      sha256: "8b900be766e6015b27aba6bcde965ac37f9c22900458e4e10cca7f4c84406e21"
+  - name: "com_google_protobuf"
+    download_url: "https://github.com/protocolbuffers/protobuf/archive/v3.21.12.tar.gz"
+    checksums:
+      sha256: "930c2c3b5ecc6c9c12615cf5ad93f1cd6e12d0aba862b572e076259970ac3a53"
+

ml_metadata/tools/docker_server/Dockerfile.konflux

@@ -18,15 +18,22 @@ RUN dnf install -y \
   findutils \
   python3
 
+RUN ls -la ./cachi2/output/deps/generic
 
 COPY . /mlmd-src
+RUN mkdir -p /mlmd-src/generic && \
+    cd ./cachi2/output/deps/generic && \
+    for file in *; do cp "$file" /mlmd-src/generic/; done
+
 WORKDIR /mlmd-src
+RUN ls -la /mlmd-src
 
 # Running in offline mode with --nofetch arg, cache and deps must be cloned 
 # into the local root bazel cache
 # "-std=c++17" is needed in order to build with ZetaSQL.
 RUN bazel build -c opt --action_env=PATH \
   --define=grpc_no_ares=true \
+  --disk_cache=/mlmd-src/generic \
   //ml_metadata/metadata_store:metadata_store_server \
   --cxxopt="-std=c++17" --host_cxxopt="-std=c++17" \
   --verbose_failures