diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-03-10 14:15:20 +0100 |
|---|---|---|
| committer | Philip Kuryloski <kuryloskip@vmware.com> | 2021-03-10 14:15:20 +0100 |
| commit | 288101034da0c98a6b5ea52431418aad791d73d9 (patch) | |
| tree | 18edace11b8b484a0a64b96fefb7ec331dd48655 | |
| parent | 56915f1cba62145f4df6158645b8d452936cd7ce (diff) | |
| download | rabbitmq-server-git-288101034da0c98a6b5ea52431418aad791d73d9.tar.gz | |
WIP: GitHub Actions without docker images 24
| -rw-r--r-- | .github/workflows/test-erlang-otp-23.1.yaml | 6 | ||||
| -rw-r--r-- | .github/workflows/test-erlang-otp-git.yaml | 6 | ||||
| -rw-r--r-- | workflow_sources/deps.yml | 2 | ||||
| -rw-r--r-- | workflow_sources/test/tests.lib.yml | 8 |
4 files changed, 14 insertions, 8 deletions
diff --git a/.github/workflows/test-erlang-otp-23.1.yaml b/.github/workflows/test-erlang-otp-23.1.yaml index 0144cf3e69..a1c3dbb401 100644 --- a/.github/workflows/test-erlang-otp-23.1.yaml +++ b/.github/workflows/test-erlang-otp-23.1.yaml @@ -11100,8 +11100,6 @@ jobs: - name: INSTALL slapd if: steps.cache.outputs.cache-hit != 'true' run: | - sudo apt-get update - sudo apt-get install -y -V --fix-missing --no-install-recommends \ debconf-utils @@ -11113,6 +11111,10 @@ jobs: sudo apt-get install -y -V --fix-missing --no-install-recommends \ ldap-utils \ + netcat \ + python-dev \ + python-simplejson \ + python3 \ slapd - name: RUN TESTS if: steps.cache.outputs.cache-hit != 'true' diff --git a/.github/workflows/test-erlang-otp-git.yaml b/.github/workflows/test-erlang-otp-git.yaml index 932493cad0..24006ef4c8 100644 --- a/.github/workflows/test-erlang-otp-git.yaml +++ b/.github/workflows/test-erlang-otp-git.yaml @@ -5243,8 +5243,6 @@ jobs: - name: INSTALL slapd if: steps.cache.outputs.cache-hit != 'true' run: | - sudo apt-get update - sudo apt-get install -y -V --fix-missing --no-install-recommends \ debconf-utils @@ -5256,6 +5254,10 @@ jobs: sudo apt-get install -y -V --fix-missing --no-install-recommends \ ldap-utils \ + netcat \ + python-dev \ + python-simplejson \ + python3 \ slapd - name: RUN TESTS if: steps.cache.outputs.cache-hit != 'true' diff --git a/workflow_sources/deps.yml b/workflow_sources/deps.yml index e6cd2ffdb3..97ec24831d 100644 --- a/workflow_sources/deps.yml +++ b/workflow_sources/deps.yml @@ -150,7 +150,7 @@ deps: - name: rabbitmq_auth_backend_ldap skip_dialyzer: true - use_slapd: true + needs_slapd: true suites: - name: config_schema - name: system diff --git a/workflow_sources/test/tests.lib.yml b/workflow_sources/test/tests.lib.yml index c3a983c90d..1be6b674a9 100644 --- a/workflow_sources/test/tests.lib.yml +++ b/workflow_sources/test/tests.lib.yml @@ -28,12 +28,10 @@ steps: with: otp-version: #@ erlang_version elixir-version: #@ data.values.elixir_version - #@ if getattr(dep, 'use_slapd', False): + #@ if getattr(dep, 'needs_slapd', False): - name: INSTALL slapd if: steps.cache.outputs.cache-hit != 'true' run: | - sudo apt-get update - sudo apt-get install -y -V --fix-missing --no-install-recommends \ debconf-utils @@ -45,6 +43,10 @@ steps: sudo apt-get install -y -V --fix-missing --no-install-recommends \ ldap-utils \ + netcat \ + python-dev \ + python-simplejson \ + python3 \ slapd #@ end #@ if getattr(dep, 'needs_daemonize', False): |