diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-03-10 10:38:22 +0100 |
|---|---|---|
| committer | Philip Kuryloski <kuryloskip@vmware.com> | 2021-03-10 10:38:22 +0100 |
| commit | ca99675f9ceef772e2dce6c8d44c1c3ee0737ec8 (patch) | |
| tree | f49cc7a06157c2d08814f771fb3ac8d16f124ae7 | |
| parent | a1c358517e0b21b41ae79f324213eeeb09d014d1 (diff) | |
| download | rabbitmq-server-git-ca99675f9ceef772e2dce6c8d44c1c3ee0737ec8.tar.gz | |
WIP: GitHub Actions without docker images 17
| -rw-r--r-- | .github/workflows/test-erlang-otp-23.1.yaml | 7 | ||||
| -rw-r--r-- | .github/workflows/test-erlang-otp-git.yaml | 7 | ||||
| -rw-r--r-- | workflow_sources/deps.yml | 2 | ||||
| -rw-r--r-- | workflow_sources/test/tests.lib.yml | 9 |
4 files changed, 11 insertions, 14 deletions
diff --git a/.github/workflows/test-erlang-otp-23.1.yaml b/.github/workflows/test-erlang-otp-23.1.yaml index e97ce86585..c9437ed2a3 100644 --- a/.github/workflows/test-erlang-otp-23.1.yaml +++ b/.github/workflows/test-erlang-otp-23.1.yaml @@ -9256,12 +9256,11 @@ jobs: with: otp-version: "23.1" elixir-version: 1.10.4 - - name: PREPARE TERRAFORM SECRETS + - name: RUN TESTS run: | echo "${{ secrets.TERRAFORM_SSH_KEY }}" > id_rsa_terraform echo "${{ secrets.TERRAFORM_SSH_KEY_PUB }}" > id_rsa_terraform.pub - - name: RUN TESTS - run: | + function run_tests() { make -C deps/rabbitmq_peer_discovery_aws tests \ base_rmq_ref=master \ @@ -9369,7 +9368,7 @@ jobs: with: otp-version: "23.1" elixir-version: 1.10.4 - - name: INSTALL etcd + - name: INSTALL daemonize run: | sudo apt-get install -y -V --fix-missing --no-install-recommends \ daemonize diff --git a/.github/workflows/test-erlang-otp-git.yaml b/.github/workflows/test-erlang-otp-git.yaml index d44e3cc14b..6cb273008f 100644 --- a/.github/workflows/test-erlang-otp-git.yaml +++ b/.github/workflows/test-erlang-otp-git.yaml @@ -4285,12 +4285,11 @@ jobs: with: otp-version: git elixir-version: 1.10.4 - - name: PREPARE TERRAFORM SECRETS + - name: RUN TESTS run: | echo "${{ secrets.TERRAFORM_SSH_KEY }}" > id_rsa_terraform echo "${{ secrets.TERRAFORM_SSH_KEY_PUB }}" > id_rsa_terraform.pub - - name: RUN TESTS - run: | + function run_tests() { make -C deps/rabbitmq_peer_discovery_aws tests \ base_rmq_ref=master \ @@ -4398,7 +4397,7 @@ jobs: with: otp-version: git elixir-version: 1.10.4 - - name: INSTALL etcd + - name: INSTALL daemonize run: | sudo apt-get install -y -V --fix-missing --no-install-recommends \ daemonize diff --git a/workflow_sources/deps.yml b/workflow_sources/deps.yml index fb73a81875..e6cd2ffdb3 100644 --- a/workflow_sources/deps.yml +++ b/workflow_sources/deps.yml @@ -282,7 +282,7 @@ deps: - name: rabbitmq_peer_discovery_etcd skip_dialyzer: true - use_etcd: true + needs_daemonize: true suites: - name: config_schema - name: system diff --git a/workflow_sources/test/tests.lib.yml b/workflow_sources/test/tests.lib.yml index fafaff379a..ef77ca7fd7 100644 --- a/workflow_sources/test/tests.lib.yml +++ b/workflow_sources/test/tests.lib.yml @@ -29,20 +29,19 @@ steps: ldap-utils \ slapd #@ end - #@ if getattr(dep, 'use_etcd', False): - - name: INSTALL etcd + #@ if getattr(dep, 'needs_daemonize', False): + - name: INSTALL daemonize run: | sudo apt-get install -y -V --fix-missing --no-install-recommends \ daemonize #@ end #@ tests_cmd = " || ".join(["run_tests"] * getattr(dep, 'attempts', 1)) #@ if getattr(dep, 'use_terraform', False): - - name: PREPARE TERRAFORM SECRETS + - name: RUN TESTS run: | echo "${{ secrets.TERRAFORM_SSH_KEY }}" > id_rsa_terraform echo "${{ secrets.TERRAFORM_SSH_KEY_PUB }}" > id_rsa_terraform.pub - - name: RUN TESTS - run: | + function run_tests() { make -C deps/(@= dep.name @) tests \ base_rmq_ref=(@= data.values.base_rmq_ref @) \ |