commit dae21ce4f8794257c46a32ca3e67b6fc52d9c791
author Tim Windelschmidt <tim@monogon.tech> Tue Jun 13 20:41:07 2023 +0200
committer Tim Windelschmidt <tim@monogon.tech> Thu Jan 11 14:21:03 2024 +0000
tree c4b8dd07d82deffa6117ba4b1e69ffec68ff64dc
parent 087152ba642040410bbfb9d673ff69ca6682a549

build/ci: replace build container with nix

Change-Id: Ie304e50bef9a7d19aa57d5d0e63e6f1e574941ea
Reviewed-on: https://review.monogon.dev/c/monogon/+/2185
Reviewed-by: Leopold Schabel <leo@monogon.tech>
Tested-by: Jenkins CI

build/ci/jenkins-presubmit.groovy

diff --git a/build/ci/jenkins-presubmit.groovy b/build/ci/jenkins-presubmit.groovy
index d5ad565..4df1116 100644
--- a/build/ci/jenkins-presubmit.groovy
+++ b/build/ci/jenkins-presubmit.groovy
@@ -21,10 +21,10 @@
                         gerritCheck checks: ['jenkins:test': 'RUNNING'], message: "Running on ${env.NODE_NAME}"
                         echo "Gerrit change: ${GERRIT_CHANGE_URL}"
                         sh "git clean -fdx -e '/bazel-*'"
-                        sh "JENKINS_NODE_COOKIE=dontKillMe bazelisk test //..."
-                        sh "JENKINS_NODE_COOKIE=dontKillMe bazelisk build  --//metropolis/cli/metroctl:buildkind=lite --platforms=@io_bazel_rules_go//go/toolchain:darwin_arm64 //metropolis/cli/metroctl"
-                        sh "JENKINS_NODE_COOKIE=dontKillMe bazelisk build  --//metropolis/cli/metroctl:buildkind=lite --platforms=@io_bazel_rules_go//go/toolchain:darwin_amd64 //metropolis/cli/metroctl"
-                        sh "JENKINS_NODE_COOKIE=dontKillMe bazelisk test --config dbg //..."
+                        sh "JENKINS_NODE_COOKIE=dontKillMe tools/bazel test //..."
+                        sh "JENKINS_NODE_COOKIE=dontKillMe tools/bazel build  --//metropolis/cli/metroctl:buildkind=lite --platforms=@io_bazel_rules_go//go/toolchain:darwin_arm64 //metropolis/cli/metroctl"
+                        sh "JENKINS_NODE_COOKIE=dontKillMe tools/bazel build  --//metropolis/cli/metroctl:buildkind=lite --platforms=@io_bazel_rules_go//go/toolchain:darwin_amd64 //metropolis/cli/metroctl"
+                        sh "JENKINS_NODE_COOKIE=dontKillMe tools/bazel test --config dbg //..."
                     }
                     post {
                         success {
@@ -47,9 +47,9 @@
                         gerritCheck checks: ['jenkins:gazelle': 'RUNNING'], message: "Running on ${env.NODE_NAME}"
                         echo "Gerrit change: ${GERRIT_CHANGE_URL}"
                         sh "git clean -fdx -e '/bazel-*'"
-                        sh "JENKINS_NODE_COOKIE=dontKillMe bazelisk run //:gazelle-update-repos"
-                        sh "JENKINS_NODE_COOKIE=dontKillMe bazelisk run //:gazelle -- update"
-                        sh "JENKINS_NODE_COOKIE=dontKillMe bazelisk run //:go -- mod tidy"
+                        sh "JENKINS_NODE_COOKIE=dontKillMe tools/bazel run //:gazelle-update-repos"
+                        sh "JENKINS_NODE_COOKIE=dontKillMe tools/bazel run //:gazelle -- update"
+                        sh "JENKINS_NODE_COOKIE=dontKillMe tools/bazel run //:go -- mod tidy"
 
                         script {
                             def diff = sh script: "git status --porcelain", returnStdout: true