Fix MAAS image publish playbook

Also reviving yaml linting in the gate

Change-Id: I45c29596f36fd35e2cad6ff6294daa4987f6319f
Signed-off-by: Sergiy Markin <smarkin@mirantis.com>
This commit is contained in:
Sergiy Markin
2025-10-16 15:34:49 +00:00
parent 4067d6461a
commit 391ab52a68
7 changed files with 37 additions and 25 deletions

View File

@@ -141,7 +141,7 @@
voting: true
timeout: 900
run: tools/gate/playbooks/lint-yaml.yaml
nodeset: airship-maas-single-node
nodeset: airship-maas-single-node-jammy
irrelevant-files:
- "^charts/maas/templates/.*"

View File

@@ -206,7 +206,8 @@ conf:
# driver_NN_*, drydock_NN, and maas
# Example:
# late_commands:
# install_modules_extra: ["curtin", "in-target", "--", "apt-get", "-y", "install", "linux-modules-extra-4.15.0-88-generic"]
# install_modules_extra: ["curtin", "in-target", "--", "apt-get",
# "-y", "install", "linux-modules-extra-4.15.0-88-generic"]
cloudconfig:
override: false
sections: {}
@@ -260,7 +261,7 @@ conf:
use_external_only: false
ntp_servers: []
dns:
require_dnssec: no
require_dnssec: false
# These are upstream servers
dns_servers: []
proxy:
@@ -296,7 +297,8 @@ conf:
enable_analytics: false
# network_discovery: 'enabled' or 'disabled'
network_discovery: disabled
# active_discovery_interval (seconds): one of '0', '604800', '86400', '43200', '21600', '10800', '3600', '1800', '600'
# active_discovery_interval (seconds):
# one of '0', '604800', '86400', '43200', '21600', '10800', '3600', '1800', '600'
active_discovery_interval: 0
# enlist_commissioning: if true, directly go into commissioning during enlistment
enlist_commissioning: false

View File

@@ -1 +1 @@
[![Docker Repository on Quay](https://quay.io/repository/airshipit/maas-rack/status "Docker Repository on Quay")](https://quay.io/repository/airshipit/maas-rack) Ubuntu MaaS Rack Controller
[![Docker Repository on Quay](https://quay.io/repository/airshipit/maas-rack-controller-focal "Docker Repository on Quay")](https://quay.io/repository/airshipit/maas-rack-controller-focal) Ubuntu MaaS Rack Controller

View File

@@ -53,14 +53,14 @@
- pip:
name: docker
executable: pip3
become: True
become: true
- name: Install tox python module for ansible docker login
block:
- pip:
name: tox
executable: pip3
become: True
become: true
- name: Make images - verbosive
when: not publish
@@ -72,7 +72,7 @@
args:
chdir: "{{ zuul.project.src_dir }}"
executable: /bin/bash
become: True
become: true
- name: Make images
when: not publish
@@ -80,12 +80,11 @@
- make:
chdir: "{{ zuul.project.src_dir }}"
target: images
params:
IMAGE_TAG: "{{ item }}"
with_items: "{{ image_tags.stdout_lines }}"
environment:
DISTRO: "{{ distro }}"
DISTRO_ALIAS: "{{ distro }}"
IMAGE_TAG: "{{ item }}"
- shell: "docker images"
register: docker_images
@@ -93,7 +92,7 @@
- debug:
var: docker_images
become: True
become: true
- name: Publish images
block:
@@ -106,15 +105,15 @@
- make:
chdir: "{{ zuul.project.src_dir }}"
target: images
params:
DOCKER_REGISTRY: "quay.io"
IMAGE_PREFIX: "airshipit"
IMAGE_TAG: "{{ item }}"
DISTRO: "{{ distro }}"
DISTRO_ALIAS: "{{ distro }}"
COMMIT: "{{ zuul.newrev | default('') }}"
PUSH_IMAGE: "true"
with_items: "{{ image_tags.stdout_lines }}"
environment:
DISTRO: "{{ distro }}"
DISTRO_ALIAS: "{{ distro }}"
DOCKER_REGISTRY: "quay.io"
IMAGE_PREFIX: "airshipit"
IMAGE_TAG: "{{ item }}"
COMMIT: "{{ zuul.newrev | default('') }}"
PUSH_IMAGE: "true"
- shell: "docker images"
register: docker_images
@@ -123,4 +122,4 @@
var: docker_images
when: publish
become: True
become: true

View File

@@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- hosts: ubuntu-bionic
- hosts: primary
tasks:
- name: lint-yaml
shell: |

View File

@@ -17,4 +17,4 @@ docker_daemon:
registry-mirrors:
- "http://{{ zuul_site_mirror_fqdn }}:8082/"
storage-driver: overlay2
debug: True
debug: true

View File

@@ -11,10 +11,21 @@
# limitations under the License.
---
extends: default
# Pathspecs for files to include in linting
yaml-files:
- '*.yaml'
- '*.yml'
# Paths to ignore from linting
ignore: |
**/charts/deps/**
**/charts/maas/templates/**
**/build/**
**/build/charts/maas/templates/job-db-sync.yaml
**/docs/**
ignore:
/charts/maas/templates/
rules:
line-length:
max: 80
max: 120
level: warning