Fix mis-copied path in kokoro config (#4187)
diff --git a/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-swiftshader/build.sh b/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-swiftshader/build.sh index 8595a70..4c6799b 100755 --- a/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-swiftshader/build.sh +++ b/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-swiftshader/build.sh
@@ -35,6 +35,19 @@ # Print SwiftShader git commit cat /swiftshader/git-commit +# TODO(4195): TensorFlow integrations can only be built out-of-tree (and kokoro +# does not support that). +# Temporarily get around these conflicting restrictions by nesting the git +# repo under `/src/github/iree/iree` +echo "Nesting iree.git into /src/github/iree/iree" +mv iree iree-core # Temporarily move iree/ so that we move the repo under it. +shopt -s dotglob nullglob # Make globs include dotfiles/dirs like `.git`. +mkdir iree +mv * ./iree | true # | true to catch "can't mv ./iree into itself" +cd iree +mv iree-core iree # Move iree-core/ back to iree/ +ls -1 -a + echo "Initializing submodules" ./scripts/git/submodule_versions.py init
diff --git a/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-swiftshader/build_kokoro.sh b/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-swiftshader/build_kokoro.sh index dd874f8..a8de56a 100755 --- a/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-swiftshader/build_kokoro.sh +++ b/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-swiftshader/build_kokoro.sh
@@ -33,7 +33,7 @@ docker run "${DOCKER_RUN_ARGS[@]?}" \ gcr.io/iree-oss/cmake-bazel-tensorflow-swiftshader@sha256:e4516f3ffadf40f2111c3f152453928f5af24951c7b5770ef3477f897709df0d \ - build_tools/kokoro/gcp_ubuntu/cmake/linux/x86-swiftshader/build.sh + build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-swiftshader/build.sh # Kokoro will rsync this entire directory back to the executor orchestrating the # build which takes forever and is totally useless.
diff --git a/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-turing/build.sh b/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-turing/build.sh index 277a960..7201905 100755 --- a/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-turing/build.sh +++ b/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-turing/build.sh
@@ -35,6 +35,19 @@ # Print SwiftShader git commit cat /swiftshader/git-commit +# TODO(4195): TensorFlow integrations can only be built out-of-tree (and kokoro +# does not support that). +# Temporarily get around these conflicting restrictions by nesting the git +# repo under `/src/github/iree/iree` +echo "Nesting iree.git into /src/github/iree/iree" +mv iree iree-core # Temporarily move iree/ so that we move the repo under it. +shopt -s dotglob nullglob # Make globs include dotfiles/dirs like `.git`. +mkdir iree +mv * ./iree | true # | true to catch "can't mv ./iree into itself" +cd iree +mv iree-core iree # Move iree-core/ back to iree/ +ls -1 -a + echo "Initializing submodules" ./scripts/git/submodule_versions.py init
diff --git a/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-turing/build_kokoro.sh b/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-turing/build_kokoro.sh index 36d919c..1786a30 100755 --- a/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-turing/build_kokoro.sh +++ b/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-turing/build_kokoro.sh
@@ -33,7 +33,7 @@ docker run "${DOCKER_RUN_ARGS[@]?}" \ gcr.io/iree-oss/cmake-bazel-tensorflow-nvidia@sha256:1351b5befd1bc4b89fc6f203754a05accff204579f122ec1123e86ed7e2bd319 \ - build_tools/kokoro/gcp_ubuntu/cmake/linux/x86-swiftshader/build.sh + build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-turing/build.sh # Kokoro will rsync this entire directory back to the executor orchestrating the # build which takes forever and is totally useless.