diff options
| author | Sviatoslav Sydorenko <wk@sydorenko.org.ua> | 2022-07-20 22:20:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-20 13:20:10 -0700 |
| commit | b53419c8f3931041f05dd55e9e07b34f8aabe903 (patch) | |
| tree | cd8d06a6904971d4f23f97112ef51158d100b40e | |
| parent | 1c964ff27e168ceca728de42e966d1c0a585dd5b (diff) | |
| download | ansible-b53419c8f3931041f05dd55e9e07b34f8aabe903.tar.gz | |
Drop custom repo from libuser install @ Alpine CI (#78305) (#78307)
`group` and `setup_cron` integration tests currently install `libuser` and `faketime`
packages respectively, from the non-default edge/testing repositories. It is no
longer necessary to do so for the former so this patch drops the repo option. As
for the latter, this patch includes a note explaining when the same could be done
for it too.
This patch also adds a note on installing `faketime` on Alpine in CI.
(cherry picked from commit 619a1fa7e29749a91f7c5e6d5b5a6129bb57eca0)
| -rw-r--r-- | test/integration/targets/group/tasks/tests.yml | 2 | ||||
| -rw-r--r-- | test/integration/targets/setup_cron/tasks/main.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/test/integration/targets/group/tasks/tests.yml b/test/integration/targets/group/tasks/tests.yml index a724c9dfae..aaf7402d4e 100644 --- a/test/integration/targets/group/tasks/tests.yml +++ b/test/integration/targets/group/tasks/tests.yml @@ -211,7 +211,7 @@ - user_test_local_mode - name: Ensure lgroupadd is present - Alpine - command: apk add -U libuser --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community + command: apk add -U libuser when: ansible_distribution == 'Alpine' tags: - user_test_local_mode diff --git a/test/integration/targets/setup_cron/tasks/main.yml b/test/integration/targets/setup_cron/tasks/main.yml index d7ce330300..7005ce6b25 100644 --- a/test/integration/targets/setup_cron/tasks/main.yml +++ b/test/integration/targets/setup_cron/tasks/main.yml @@ -27,6 +27,11 @@ when: ansible_distribution != 'Alpine' - name: install faketime packages - Alpine + # NOTE: The `faketime` package is currently only available in the + # NOTE: `edge` branch. + # FIXME: If it ever becomes available in the `main` repository for + # FIXME: currently tested Alpine versions, the `--repository=...` + # FIXME: option can be dropped. command: apk add -U {{ faketime_pkg }} --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing when: ansible_distribution == 'Alpine' |