diff --git a/examples/basic_graph/MODULE.bazel b/examples/basic_graph/MODULE.bazel index fae472f..225fb0f 100644 --- a/examples/basic_graph/MODULE.bazel +++ b/examples/basic_graph/MODULE.bazel @@ -42,7 +42,7 @@ oci = use_extension("@rules_oci//oci:extensions.bzl", "oci") oci.pull( name = "debian", image = "docker.io/library/python", - platforms = ["linux/arm64/v8"], + platforms = ["linux/arm64/v8", "linux/amd64"], # 'latest' is not reproducible, but it's convenient. # During the build we print a WARNING message that includes recommended 'digest' and 'platforms' # values which you can use here in place of 'tag' to pin for reproducibility. diff --git a/examples/basic_graph/MODULE.bazel.lock b/examples/basic_graph/MODULE.bazel.lock index b76f88c..99b8b60 100644 --- a/examples/basic_graph/MODULE.bazel.lock +++ b/examples/basic_graph/MODULE.bazel.lock @@ -409,7 +409,7 @@ "@@rules_oci+//oci:extensions.bzl%oci": { "general": { "bzlTransitiveDigest": "8fB61KHYOU4XHH65DqVw59ZIDGO29I2WIbVHxii4slA=", - "usagesDigest": "Tv86j1zFNsYhAktbkhrrqXqeKOuY5MkeuoLawY/PY/w=", + "usagesDigest": "ODhFrEQ2CPXo09/Bj4hN8YP6s+1rYpgY/ecJv8DR1+8=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -427,6 +427,19 @@ "bazel_tags": [] } }, + "debian_linux_amd64": { + "repoRuleId": "@@rules_oci+//oci/private:pull.bzl%oci_pull", + "attributes": { + "www_authenticate_challenges": {}, + "scheme": "https", + "registry": "index.docker.io", + "repository": "library/python", + "identifier": "3.12-bookworm", + "platform": "linux/amd64", + "target_name": "debian_linux_amd64", + "bazel_tags": [] + } + }, "debian": { "repoRuleId": "@@rules_oci+//oci/private:pull.bzl%oci_alias", "attributes": { @@ -437,7 +450,8 @@ "repository": "library/python", "identifier": "3.12-bookworm", "platforms": { - "@@platforms//cpu:arm64": "@debian_linux_arm64_v8" + "@@platforms//cpu:arm64": "@debian_linux_arm64_v8", + "@@platforms//cpu:x86_64": "@debian_linux_amd64" }, "bzlmod_repository": "debian", "reproducible": true @@ -560,7 +574,8 @@ "moduleExtensionMetadata": { "explicitRootModuleDirectDeps": [ "debian", - "debian_linux_arm64_v8" + "debian_linux_arm64_v8", + "debian_linux_amd64" ], "explicitRootModuleDirectDevDeps": [], "useAllRepos": "NO", diff --git a/examples/basic_graph/test/sum_test.sh b/examples/basic_graph/test/sum_test.sh index d4f3490..2f2d315 100755 --- a/examples/basic_graph/test/sum_test.sh +++ b/examples/basic_graph/test/sum_test.sh @@ -1,15 +1,19 @@ #!/bin/bash set -e +rm -rf /tmp/databuild_test/examples/basic_graph +mkdir -p /tmp/databuild_test/examples/basic_graph/generated_number +mkdir -p /tmp/databuild_test/examples/basic_graph/sum + # Test configure -sum_job.cfg pippin_salem_sadie +sum_job.cfg /tmp/databuild_test/examples/basic_graph/sum/pippin_salem_sadie # Test run echo -n 83 > /tmp/databuild_test/examples/basic_graph/generated_number/pippin echo -n 34 > /tmp/databuild_test/examples/basic_graph/generated_number/salem echo -n 19 > /tmp/databuild_test/examples/basic_graph/generated_number/sadie -sum_job.cfg pippin_salem_sadie | jq -c ".[0]" | sum_job.exec +sum_job.cfg /tmp/databuild_test/examples/basic_graph/sum/pippin_salem_sadie | jq -c ".[0]" | sum_job.exec # Validate that contents of output is 136 if [[ "$(cat /tmp/databuild_test/examples/basic_graph/sum/pippin_salem_sadie)" != "136" ]]; then @@ -17,3 +21,4 @@ if [[ "$(cat /tmp/databuild_test/examples/basic_graph/sum/pippin_salem_sadie)" ! cat /tmp/databuild_test/examples/basic_graph/sum/pippin_salem_sadie exit 1 fi + diff --git a/scripts/bb_remote_test_all b/scripts/bb_remote_test_all new file mode 100755 index 0000000..069074a --- /dev/null +++ b/scripts/bb_remote_test_all @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +eval $(bb_tmp) +ssh $BUILD_HOST "cd $REMOTE_BUILD_PATH; . ~/.bash_profile; bash scripts/bb_test_all" diff --git a/scripts/bb_test_all b/scripts/bb_test_all index 8792c86..66f9b76 100755 --- a/scripts/bb_test_all +++ b/scripts/bb_test_all @@ -1,7 +1,6 @@ #!/usr/bin/env bash ROOT_DIR=$(pwd) -eval $(bb_tmp) bazel test //... ANY_FAILED=0 for EXAMPLE in $(ls examples); do