Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
fail-fast: false
matrix:
pulp:
- "3.16"
- "3.21"
- "3.45"
steps:
# Checks-out the repository under $GITHUB_WORKSPACE, so it's accessible to the job
- uses: actions/checkout@v3
Expand All @@ -27,7 +27,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install ansible==5.* jmespath
pip install ansible==5.* jmespath pulp-glue==0.21.*
ansible-galaxy collection install git+file://$(pwd)

- name: Run Pulp in one
Expand Down
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ namespace: stackhpc
name: pulp
description: >
Roles and plugins Pulp repository server configuration
version: "0.5.4"
version: "0.5.5"
readme: "README.md"
authors:
- "Piotr Parczewski"
Expand Down
8 changes: 8 additions & 0 deletions plugins/modules/pulp_container_content.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
- Whether to allow missing tags when state is present.
type: bool
default: false
is_push:
description:
- Whether repository is a container-push repository.
type: bool
default: false
src_repo:
description:
- Name of the repository to copy content from when state is present.
Expand Down Expand Up @@ -181,6 +186,8 @@ def read(self):
self.get_content_units(self)

def process(self):
if self.module.params["state"] == "read" and self.module.params["is_push"]:
self._list_id = "repositories_container_container_push_list"
# Populate self.entity.
self.find(failsafe=False)
if self.module.params["state"] == "present":
Expand All @@ -198,6 +205,7 @@ def main():
with PulpEntityAnsibleModule(
argument_spec=dict(
allow_missing={"type": "bool", "default": False},
is_push={"type": "bool", "default": False},
repository={"required": True},
src_repo={},
src_is_push={"type": "bool", "default": False},
Expand Down
1 change: 1 addition & 0 deletions roles/pulp_container_content/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
password: "{{ pulp_password }}"
validate_certs: "{{ pulp_validate_certs | bool }}"
allow_missing: "{{ item.allow_missing | default(omit) }}"
is_push: "{{ item.is_push | default(omit) }}"
src_repo: "{{ item.src_repo | default(omit) }}"
src_is_push: "{{ item.src_is_push | default(omit) }}"
repository: "{{ item.repository }}"
Expand Down
2 changes: 1 addition & 1 deletion tests/pulp-in-one.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -o pipefail

mkdir -p settings

PULP_TAG=${PULP_TAG:-"3.21"}
PULP_TAG=${PULP_TAG:-"3.45"}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


cat << EOF > settings/settings.py
CONTENT_ORIGIN='http://$(hostname):8080'
Expand Down