Update packages prestage logic for Debian

Changes have been made which accomplish prestaging of
the repo and container images on the Debian subcloud. The existing
prestage logic has been modified so that the kickstart can find the
prestaged software packages for debian.

In this commit:
  - software packages are now prestaged under /opt/platform-backup/ostree_repo.
  - registry user images prestage location remains unchanged (versioned).
  - remove code related to prestage_packages_completed flag as
    it is no longer relevant. The ostree repo prestage can be re-run.

Test Plan:
PASS: Verify that the ostree_repo is prestaged at
      /opt/platform-backup.

PASS: Verify that the container images are prestaged at
      /opt/platform-backup/<release id>.

PASS: Verify that remote install uses prestaged ostree_repo if exists.

PASS: Verify that reinstall uses prestaged ostree_repo if it exists.

Story: 2010120
Task: 46840

Signed-off-by: Shrikumar Sharma <shrikumar.sharma@windriver.com>
Change-Id: Ia4aeb577b71b407ffd71bc41b8cd14b7fa0301e9
This commit is contained in:
Shrikumar Sharma
2022-11-15 02:12:13 +00:00
parent 0ab8c95376
commit d1a7299c8c
6 changed files with 5 additions and 34 deletions

View File

@@ -13,13 +13,6 @@
set_fact:
images_cleanup_dir: "{{ platform_backup_dir}}/{{ input_dir }}"
- name: Delete packages prestage completed flag
file:
path: "{{ platform_backup_dir}}/{{ input_dir }}/{{ packages_prestage_completed_flag }}"
state: absent
become: yes
when: prestage_type == "packages"
- block:
- name: Check if {{ images_cleanup_dir }} exists
stat:

View File

@@ -22,7 +22,7 @@
- name: Set prestage dir and subdirectory facts
set_fact:
prestage_reason: upgrade
prestage_dir: "{{ platform_backup_dir }}/{{ prestage_software_version }}"
prestage_dir: "{{ platform_backup_dir }}"
packages_prestage_completed_flag: ".packages_prestage_completed"
- name: Retrieve current software version of the host
@@ -46,21 +46,6 @@
prestage_reason: reinstall
when: prestage_software_version == host_software_version
- block:
- name: Look for packages_prestage_completed flag
stat:
path: "{{ prestage_dir }}/{{ packages_prestage_completed_flag }}"
register: flag_file_check
- block:
- name: Skip packages prestaging if it was completed already
debug:
msg: "Packages prestaging for {{ prestage_software_version }} is already completed."
- meta: end_play
when: flag_file_check.stat.exists
when: prestage_type == "packages"
- block:
- block:
- name: Skip images prestaging for upgrade if images list is not specified

View File

@@ -85,7 +85,7 @@
no_log: true
- name: Generate image bundles
script: gen-image-bundles.sh "{{ prestage_dir }}" "{{ images_output_file }}" "{{ bundle_size }}"
script: gen-image-bundles.sh "{{ prestage_dir }}/{{ software_version }}" "{{ images_output_file }}" "{{ bundle_size }}"
register: gen_image_bundles_output
- debug: var=gen_image_bundles_output.stdout_lines

View File

@@ -11,7 +11,7 @@
- name: Set local prestaging repo path on the subcloud
set_fact:
local_prestaging_repo: "{{ prestage_dir }}/prestaging_repo"
local_prestaging_repo: "{{ prestage_dir }}/ostree_repo"
- name: Ensure local prestaging repo path exist
file:
@@ -59,10 +59,3 @@
recurse: yes
when: prestage_reason == 'upgrade'
- name: Mark software prestaging as completed
file:
path: "{{ prestage_dir }}/{{ packages_prestage_completed_flag }}"
state: touch
owner: root
mode: 0644