Skip to content

Commit

Permalink
Move nephelaiio.plugins requirement to collection
Browse files Browse the repository at this point in the history
  • Loading branch information
teddyphreak committed Apr 25, 2024
1 parent ddcb3f3 commit 7fab1c9
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
run: sudo apt-get install -y make

- name: Run molecule tests
run: ./bin/test
run: make test
env:
PY_COLORS: '1'
ANSIBLE_FORCE_COLOR: '1'
Expand Down
9 changes: 2 additions & 7 deletions bin/test
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,7 @@ function debug {

trap debug EXIT
make template >/dev/null 2>&1 &&
make destroy &&
make create &&
make destroy create &&
make images >/dev/null 2>&1 &&
make converge &&
make wait &&
make verify &&
make side-effect &&
make verify
make converge wait verify side-effect verify
trap - EXIT
6 changes: 4 additions & 2 deletions molecule/default/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@
login_password: "{{ warehouse_pass }}"
login_host: "{{ warehouse_host }}"
vars:
warehouse_tables_expected: "{{ pagila_target_tables | map('map_format', 'pagila_public_%s') | list }}"
map_format: 'nephelaiio.plugins.map_format'
warehouse_tables_expected: "{{ pagila_target_tables | map(map_format, 'pagila_public_%s') | list }}"
warehouse_tables_pagila: "{{ warehouse_tables_found | select('match', '^pagila_public_.*') }}"
warehouse_tables_include: "{{ warehouse_tables_found | select('match', '^include_public_.*') }}"
warehouse_tables_found: "{{ warehouse_table_query.query_result | map(attribute='table_name') | list }}"
Expand All @@ -130,7 +131,8 @@
ansible.builtin.debug:
msg: "table diff=[{{ ', '.join(warehouse_tables_diff) }}]"
vars:
warehouse_tables_expected: "{{ pagila_target_tables| map('map_format', 'pagila_public_%s') | list }}"
map_format: 'nephelaiio.plugins.map_format'
warehouse_tables_expected: "{{ pagila_target_tables| map(map_format, 'pagila_public_%s') | list }}"
warehouse_tables_pagila: "{{ warehouse_tables_found | select('match', '^pagila_.*') }}"
warehouse_tables_found: "{{ warehouse_table_query.query_result | map(attribute='table_name') | list }}"
warehouse_tables_diff_expected: "{{ warehouse_tables_expected | difference(warehouse_tables_pagila) }}"
Expand Down
2 changes: 1 addition & 1 deletion requirements.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
roles:
- nephelaiio.plugins
- nephelaiio.kind
- nephelaiio.k8s
- geerlingguy.helm
collections:
- nephelaiio.plugins
- community.general
- community.postgresql

0 comments on commit 7fab1c9

Please sign in to comment.