diff --git a/ansible/dev-pulp-container-promote.yml b/ansible/dev-pulp-container-promote.yml index da67f1e1..4cb486aa 100644 --- a/ansible/dev-pulp-container-promote.yml +++ b/ansible/dev-pulp-container-promote.yml @@ -33,3 +33,30 @@ pulp_username: "{{ dev_pulp_username }}" pulp_password: "{{ dev_pulp_password }}" pulp_distribution_container: "{{ dev_pulp_distribution_container_release }}" + + # Copy tags from stackhpc-dev to stackhpc repositories. + - import_role: + name: stackhpc.pulp.pulp_container_content + vars: + pulp_url: "{{ dev_pulp_url }}" + pulp_username: "{{ dev_pulp_username }}" + pulp_password: "{{ dev_pulp_password }}" + pulp_container_content: >- + {%- set contents = [] -%} + {%- for base_distro in kolla_base_distros -%} + {%- for image in kolla_container_images_filtered -%} + {%- if image not in kolla_unbuildable_images[base_distro]-%} + {%- set src_image_repo = "stackhpc-dev/" ~ base_distro ~ "-source-" ~ image -%} + {%- set dest_image_repo = "stackhpc/" ~ base_distro ~ "-source-" ~ image -%} + {%- set content = { + "allow_missing": True, + "src_repo": src_image_repo, + "src_is_push": true, + "repository": dest_image_repo, + "tags": [dev_pulp_repository_container_promotion_tag], + } -%} + {%- set _ = contents.append(content) -%} + {%- endif -%} + {%- endfor -%} + {%- endfor -%} + {{ contents }} diff --git a/ansible/inventory/group_vars/all/dev-pulp-containers b/ansible/inventory/group_vars/all/dev-pulp-containers index 55604964..7856c20d 100644 --- a/ansible/inventory/group_vars/all/dev-pulp-containers +++ b/ansible/inventory/group_vars/all/dev-pulp-containers @@ -8,12 +8,6 @@ dev_release_pulp_registry_url: "{{ dev_pulp_url }}" # Common parameters for release image repositories. dev_pulp_repository_container_repo_release_common: - url: "{{ dev_release_pulp_registry_url }}" - include_tags: - - "{{ dev_pulp_repository_container_promotion_tag.strip() | mandatory }}" - policy: on_demand - remote_username: "{{ dev_pulp_username }}" - remote_password: "{{ dev_pulp_password }}" state: present # List of release container image repositories. @@ -23,8 +17,7 @@ dev_pulp_repository_container_repos_release: >- {%- for image in kolla_container_images_filtered -%} {%- if image not in kolla_unbuildable_images[base_distro]-%} {%- set image_repo = "stackhpc/" ~ base_distro ~ "-source-" ~ image -%} - {%- set upstream_repo = "stackhpc-dev/" ~ base_distro ~ "-source-" ~ image -%} - {%- set repo = {"name": image_repo, "upstream_name": upstream_repo} -%} + {%- set repo = {"name": image_repo} -%} {%- set _ = repos.append(dev_pulp_repository_container_repo_release_common | combine(repo)) -%} {%- endif -%} {%- endfor -%} diff --git a/requirements.yml b/requirements.yml index 73130d71..b78e33a1 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,7 +1,7 @@ collections: - name: stackhpc.pulp - version: 0.4.1 + version: 0.5.0 - name: community.crypto version: 2.0.2 - name: pulp.squeezer - version: 0.0.13 \ No newline at end of file + version: 0.0.13