diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2020-09-25 15:06:32 +0200 |
|---|---|---|
| committer | Philip Kuryloski <kuryloskip@vmware.com> | 2020-11-13 14:41:22 +0100 |
| commit | 316b27d65a9ed4bb3ef2d7333b2f16005968b425 (patch) | |
| tree | f0989386b114faf02485cbb7082750da67b74168 /mk | |
| parent | e32b93b3e6d9cf262b6f179e4b9e691a35a39062 (diff) | |
| download | rabbitmq-server-git-316b27d65a9ed4bb3ef2d7333b2f16005968b425.tar.gz | |
Adjustments for rabbitmq-cli tests
- Provide RABBITMQ_VERSION so that plugin version compatibility checks work
correctly
- Run tests generally as an unpriveleged user in docker, like we do in concourse
- Set USER in the env for erlang-cookie-sources tests
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/github-actions.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mk/github-actions.mk b/mk/github-actions.mk index f1b19ad5bf..4a90fb9d4e 100644 --- a/mk/github-actions.mk +++ b/mk/github-actions.mk @@ -101,7 +101,6 @@ push-base-images: $(PUSHES) LOCAL_CI_GOALS = $(foreach dep,$(filter-out rabbitmq_cli,$(VENDORED_COMPONENTS)),ci-$(dep)) ERLANG_VERSION ?= 23.0 SKIP_DIALYZE ?= False -SKIP_XREF ?= False TAG = erlang-$(ERLANG_VERSION)-rabbitmq-$(shell git rev-parse HEAD)$(shell git diff-index --quiet HEAD -- || echo -dirty) LOCAL_IMAGE = $(DOCKER_REPO)/ci:$(TAG) @@ -116,14 +115,14 @@ local-ci-image: --build-arg BUILDEVENT_APIKEY=$(BUILDEVENT_APIKEY) \ --build-arg GITHUB_SHA=$$(git rev-parse HEAD) \ --build-arg base_rmq_ref=master \ - --build-arg current_rmq_ref=$$(git rev-parse --abbrev-ref HEAD) + --build-arg current_rmq_ref=$$(git rev-parse --abbrev-ref HEAD) \ + --build-arg RABBITMQ_VERSION=3.9.0 .PHONY: $(LOCAL_CI_GOALS) $(LOCAL_CI_GOALS): local-ci-image docker run --rm \ --env project=$(subst ci-,,$@) \ --env SKIP_DIALYZE=$(SKIP_DIALYZE) \ - --env SKIP_XREF=$(SKIP_XREF) \ --env GITHUB_RUN_ID=none \ --env BUILDEVENT_APIKEY=$(BUILDEVENT_APIKEY) \ --env STEP_START=$$(date +%s) \ @@ -136,7 +135,6 @@ ci-rabbitmq_cli: local-ci-image docker run --rm \ --env project=$(subst ci-,,$@) \ --env SKIP_DIALYZE=$(SKIP_DIALYZE) \ - --env SKIP_XREF=$(SKIP_XREF) \ --env GITHUB_RUN_ID=none \ --env BUILDEVENT_APIKEY=$(BUILDEVENT_APIKEY) \ --env STEP_START=$$(date +%s) \ |