Browse Source

Fix up mixin tests (#2167)

Use new Go install format, cleanup working dir setup.

Signed-off-by: Ben Kochie <superq@gmail.com>
pull/2169/head
Ben Kochie 3 years ago committed by GitHub
parent
commit
5a38949451
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 23
      .circleci/config.yml
  2. 4
      docs/node-mixin/Makefile

23
.circleci/config.yml

@ -35,21 +35,14 @@ jobs:
executor: golang executor: golang
steps: steps:
- checkout - checkout
- run: - run: go install github.com/google/go-jsonnet/cmd/jsonnet@latest
command: go install -mod=readonly github.com/google/go-jsonnet/cmd/jsonnet github.com/google/go-jsonnet/cmd/jsonnetfmt github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb github.com/prometheus/prometheus/cmd/promtool - run: go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest
working_directory: ~/project/docs/node-mixin - run: go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@latest
- run: - run: make promtool
command: make clean - run: make -C docs/node-mixin clean
working_directory: ~/project/docs/node-mixin - run: make -C docs/node-mixin jb_install
- run: - run: make -C docs/node-mixin
command: jb install - run: git diff --exit-code
working_directory: ~/project/docs/node-mixin
- run:
command: make
working_directory: ~/project/docs/node-mixin
- run:
command: git diff --exit-code
working_directory: ~/project/docs/node-mixin
build: build:
machine: machine:

4
docs/node-mixin/Makefile

@ -24,5 +24,9 @@ lint: node_alerts.yaml node_rules.yaml
promtool check rules node_alerts.yaml node_rules.yaml promtool check rules node_alerts.yaml node_rules.yaml
.PHONY: jb_install
jb_install:
jb install
clean: clean:
rm -rf dashboards_out node_alerts.yaml node_rules.yaml rm -rf dashboards_out node_alerts.yaml node_rules.yaml

Loading…
Cancel
Save