airship/images
Code Issues Proposed changes

Change zuul workdir to match image-builder

Browse Source 
jezogwza@gmail.com requested a change from "config" to "manifests",
and this change makes zuul params reflective of this.

Allow proper operation of "find" with symlinks.

Change-Id: I1a20a1d6e2d8af2bd5212b654c7e0a1279a9c625
This commit is contained in:
Anderson, Craig (ca846m) 2021-04-06 08:36:45 -07:00
parent ee89261169
commit b2fddf30fd
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@ -21,7 +21,7 @@
https: "" https: ""
noproxy: "" noproxy: ""
makefile_chdir: "{{ zuul.project.src_dir }}" makefile_chdir: "{{ zuul.project.src_dir }}"
image_config_dir: config image_config_dir: manifests
image_prefix: airshipit image_prefix: airshipit
image_label: org.airshipit.build=community image_label: org.airshipit.build=community
image_tag: latest image_tag: latest

6
image-builder/Makefile
View File

@ -112,7 +112,8 @@ ifeq ($(IMAGE_TYPE), iso)
sudo -E tools/cut_image.sh $(IMAGE_TYPE) $(WORKDIR)/iso $(IMAGE) "$(PROXY)" "$(NO_PROXY)" sudo -E tools/cut_image.sh $(IMAGE_TYPE) $(WORKDIR)/iso $(IMAGE) "$(PROXY)" "$(NO_PROXY)"
else else
# Assemble all images based on configs defined in each subdirectory # Assemble all images based on configs defined in each subdirectory
iterDirs=`find $(QCOW_BUNDLE) -maxdepth 1 -mindepth 1 -type d -exec basename {} \;` # Trailing / allows proper function with symlinks
iterDirs="$(find $(QCOW_BUNDLE)/ -maxdepth 1 -mindepth 1 -type d -exec basename {} \;)"
for subdir in $$iterDirs; do for subdir in $$iterDirs; do
# QCOW configs # QCOW configs
export osconfig_params="$(QCOW_BUNDLE)/$$subdir/osconfig-vars.yaml" export osconfig_params="$(QCOW_BUNDLE)/$$subdir/osconfig-vars.yaml"
@ -135,7 +136,8 @@ ifneq ($(QCOW_BUNDLE_DIRS), )
bundleDirs="$(QCOW_BUNDLE_DIRS)" bundleDirs="$(QCOW_BUNDLE_DIRS)"
else else
# Assemble all images based on configs defined in each $(IMAGE_TYPE)* subdirectory # Assemble all images based on configs defined in each $(IMAGE_TYPE)* subdirectory
bundleDirs=`find $(WORKDIR) -maxdepth 1 -mindepth 1 -name "qcow-bundle*" -type d -exec basename {} \;` # Trailing / allows proper function with symlinks
bundleDirs="$(find $(WORKDIR)/ -maxdepth 1 -mindepth 1 -name "qcow-bundle*" -type d -exec basename {} \;)"
endif endif
for bundledir in $$bundleDirs; do for bundledir in $$bundleDirs; do
export QCOW_BUNDLE="$(WORKDIR)/$$bundledir" export QCOW_BUNDLE="$(WORKDIR)/$$bundledir"

2
playbooks/airship-images-build.yaml
View File

@ -54,5 +54,5 @@
PROXY: "{{ proxy.http }}" PROXY: "{{ proxy.http }}"
QCOW_CONF_DIRS: "{{ qcow_conf_dirs | default('') }}" QCOW_CONF_DIRS: "{{ qcow_conf_dirs | default('') }}"
USE_PROXY: "{{ proxy.enabled | lower }}" USE_PROXY: "{{ proxy.enabled | lower }}"
WORKDIR: "{{ image_config_dir | default('config') }}" WORKDIR: "{{ image_config_dir | default('manifests') }}"
become: True become: True

2
playbooks/airship-images-publish.yaml
View File

@ -60,5 +60,5 @@
PROXY: "{{ proxy.http }}" PROXY: "{{ proxy.http }}"
QCOW_CONF_DIRS: "{{ qcow_conf_dirs | default('') }}" QCOW_CONF_DIRS: "{{ qcow_conf_dirs | default('') }}"
USE_PROXY: "{{ proxy.enabled | lower }}" USE_PROXY: "{{ proxy.enabled | lower }}"
WORKDIR: "{{ image_config_dir | default('config') }}" WORKDIR: "{{ image_config_dir | default('manifests') }}"
become: True become: True