Skip to content

Commit

Permalink
[antlir] fix oss CI
Browse files Browse the repository at this point in the history
Summary:
CVM is going to use opensource antlir more heavily, let's make CI green again
(things keep slipping through the cracks despite actually having some real
internal tests...)

Test Plan: Export to a PR

Differential Revision: D70520233
  • Loading branch information
vmagro committed Mar 4, 2025
1 parent eb5560b commit 7addac7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ jobs:
sudo apt-get update
sudo apt-get install \
cpio jq libcap-dev systemd-container
- name: Chown home
run: |
sudo chown root:root $HOME
sudo chmod 777 $HOME
- name: Disable watchman
run: |
Expand All @@ -38,11 +43,11 @@ jobs:
- name: Test target graph
run: |
./buck2 bxl //ci:test_target_graph.bxl:test_target_graph
sudo -E env "PATH=$PATH" ./buck2 bxl //ci:test_target_graph.bxl:test_target_graph
- name: Find tests
run: |
./buck2 bxl //ci:find_tests.bxl:find_tests -- \
sudo -E env "PATH=$PATH" ./buck2 bxl //ci:find_tests.bxl:find_tests -- \
--disable //antlir/antlir2/antlir2_btrfs/... \
--disable //antlir/antlir2/antlir2_cas_dir:antlir2_cas_dir-image-test \
--disable //antlir/antlir2/antlir2_change_stream/... \
Expand All @@ -65,8 +70,8 @@ jobs:
- name: Build tests
run: |
./buck2 build --keep-going @${{ runner.temp }}/tests.txt
sudo -E env "PATH=$PATH" ./buck2 build --keep-going @${{ runner.temp }}/tests.txt
- name: Run tests
run: |
./buck2 test --keep-going @${{ runner.temp }}/tests.txt
sudo -E env "PATH=$PATH" ./buck2 test --keep-going @${{ runner.temp }}/tests.txt
4 changes: 1 addition & 3 deletions antlir/util/testing/snapshot_test/snapshot_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

load("@fbcode_macros//build_defs:fully_qualified_test_name_rollout.bzl", "NAMING_ROLLOUT_LABEL", "fully_qualified_test_name_rollout")
# @oss-disable
load("@prelude//:paths.bzl", "paths")

def _dir_snapshot_test_impl(ctx: AnalysisContext) -> list[Provider]:
Expand Down Expand Up @@ -52,8 +52,6 @@ _dir_snapshot_test = rule(

def dir_snapshot_test(**kwargs):
labels = kwargs.get("labels", [])
if fully_qualified_test_name_rollout.use_fully_qualified_name():
labels = labels + [NAMING_ROLLOUT_LABEL]

return _dir_snapshot_test(
name = kwargs.get("name"),
Expand Down

0 comments on commit 7addac7

Please sign in to comment.