From 0eaaf4dbfe3c39879316f881ac522fde51264894 Mon Sep 17 00:00:00 2001 From: Mustafa Gezen Date: Mon, 7 Nov 2022 14:03:24 +0100 Subject: [PATCH] Deploy objects with force_normal_tags should only apply --- ci/bazel.jsonnet | 6 ------ rules_resf/defs.bzl | 13 +++++++++---- 2 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 ci/bazel.jsonnet diff --git a/ci/bazel.jsonnet b/ci/bazel.jsonnet deleted file mode 100644 index d9c34acc..00000000 --- a/ci/bazel.jsonnet +++ /dev/null @@ -1,6 +0,0 @@ -{ - define_project(path):: - { - bazel_path: path - } -} diff --git a/rules_resf/defs.bzl b/rules_resf/defs.bzl index a19516c3..4e4d907e 100644 --- a/rules_resf/defs.bzl +++ b/rules_resf/defs.bzl @@ -121,12 +121,17 @@ def peridot_k8s(name, src, tags = [], outs = [], static = False, prod_only = Fal commands = dependent_push + [":%s_container" % name], tags = ["manual"], ) + push_apply_commands = [ + ":%s.push" % name, + ":%s.apply" % name, + ] + if force_normal_tags: + push_apply_commands = [ + ":%s.apply" % name, + ] multirun( name = "%s.push_apply" % name, - commands = [ - ":%s.push" % name, - ":%s.apply" % name, - ], + commands = push_apply_commands, tags = ["manual", "push_apply"], )