airship/images
Code Issues Proposed changes

Fix image publish job

Browse Source 
* Add nodeset so that image build and image publish job can run.
* change pycrypto to cryptography in pip packages

Signed-off-by: Sreejith Punnapuzha <Sreejith.Punnapuzha@outlook.com>
Change-Id: Id04561790db6d3d0745bc5d17a525f7fc1c65092
This commit is contained in:
Sreejith Punnapuzha 2021-03-29 13:26:30 -05:00
parent c652c4babc
commit 164611dcab
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.zuul.yaml
View File

@ -40,13 +40,14 @@
- job: - job:
name: airship-images-functional name: airship-images-functional
nodeset: airship-images-single-node
pre-run: playbooks/airship-images-deploy-docker.yaml pre-run: playbooks/airship-images-deploy-docker.yaml
run: playbooks/airship-images-test.yaml run: playbooks/airship-images-test.yaml
post-run: playbooks/airship-collect-logs.yaml post-run: playbooks/airship-collect-logs.yaml
nodeset: airship-images-single-node
- job: - job:
name: airship-images-build name: airship-images-build
nodeset: airship-images-single-node
timeout: 7200 timeout: 7200
post-timeout: 7200 post-timeout: 7200
pre-run: playbooks/airship-images-deploy-docker.yaml pre-run: playbooks/airship-images-deploy-docker.yaml
@ -55,6 +56,7 @@
- job: - job:
name: airship-images-publish name: airship-images-publish
nodeset: airship-images-single-node
timeout: 7200 timeout: 7200
post-timeout: 7200 post-timeout: 7200
pre-run: playbooks/airship-images-deploy-docker.yaml pre-run: playbooks/airship-images-deploy-docker.yaml

2
ironic/Makefile
View File

@ -37,7 +37,7 @@ NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
USE_PROXY ?= false USE_PROXY ?= false
BASE_IMAGE ?= docker.io/ubuntu:bionic BASE_IMAGE ?= docker.io/ubuntu:bionic
ironic_profiles ?= "fluent ipxe ipmi qemu tftp" ironic_profiles ?= "fluent ipxe ipmi qemu tftp"
ironic_pip_packages ?= "pycrypto python-openstackclient sushy" ironic_pip_packages ?= "cryptography python-openstackclient sushy"
ironic_dist_packages ?= "ethtool lshw iproute2" ironic_dist_packages ?= "ethtool lshw iproute2"
all: lint images all: lint images

2
ironic/build-image.sh
View File

@ -18,7 +18,7 @@ set -e
: "${base_extra_build_args:="--force-rm --pull --no-cache"}" : "${base_extra_build_args:="--force-rm --pull --no-cache"}"
# Defaults for projects # Defaults for projects
: "${ironic_profiles:="'fluent ipxe ipmi qemu tftp'"}" : "${ironic_profiles:="'fluent ipxe ipmi qemu tftp'"}"
: "${ironic_pip_packages:="pycrypto python-openstackclient sushy"}" : "${ironic_pip_packages:="cryptography python-openstackclient sushy"}"
: "${ironic_dist_packages:="ethtool lshw iproute2"}" : "${ironic_dist_packages:="ethtool lshw iproute2"}"
# Image tag # Image tag
if [ -z "${IMAGE_TAG}" ]; then if [ -z "${IMAGE_TAG}" ]; then