diff --git a/.zuul.yaml b/.zuul.yaml index 6cf4863..ac4f5cf 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,18 +1,13 @@ --- - job: name: k8s-capi-images-build + abstract: true parent: base pre-run: playbooks/pre.yml run: playbooks/build.yml required-projects: - kubernetes-sigs/image-builder -- job: - name: k8s-capi-images-build-124 - parent: k8s-capi-images-build - vars: - kubernetes_version: 124 - - job: name: k8s-capi-images-build-125 parent: k8s-capi-images-build @@ -25,6 +20,18 @@ vars: kubernetes_version: 126 +- job: + name: k8s-capi-images-build-127 + parent: k8s-capi-images-build + vars: + kubernetes_version: 127 + +- job: + name: k8s-capi-images-build-128 + parent: k8s-capi-images-build + vars: + kubernetes_version: 128 + - project: merge-mode: squash-merge default-branch: main @@ -32,10 +39,10 @@ jobs: - flake8 - yamllint - gate: - jobs: - - flake8 - - yamllint + - k8s-capi-images-build-125 + - k8s-capi-images-build-126 + - k8s-capi-images-build-127 + - k8s-capi-images-build-128 periodic-daily: jobs: - flake8 diff --git a/playbooks/build.yml b/playbooks/build.yml index 97853b0..c3cc9cb 100644 --- a/playbooks/build.yml +++ b/playbooks/build.yml @@ -5,14 +5,18 @@ connection: local vars: + repo_path: "/home/ubuntu/src/github.com" + + extra_vars_openstack_directory: "{{ repo_path }}/osism/k8s-capi-images" + working_directory: "{{ repo_path }}/kubernetes-sigs/image-builder/images/capi" + distro: "{{ lookup('ansible.builtin.env', 'DISTRO', default='ubuntu') }}" distro_version: "{{ lookup('ansible.builtin.env', 'DISTRO_VERSION', default='2204') }}" - extra_vars_openstack_directory: "{{ repo_path }}/osism/k8s-capi-images" kubernetes_version: "{{ lookup('ansible.builtin.env', 'KUBERNETES_VERSION', default='124') }}" - repo_path: "{{ ansible_user_dir|default('~') }}/src/github.com" - working_directory: "{{ repo_path }}/kubernetes-sigs/image-builder/images/capi" tasks: + - debug: msg="{{ ansible_user_dir }}" + - name: Run build script ansible.builtin.shell: executable: /bin/bash diff --git a/playbooks/pre.yml b/playbooks/pre.yml index 9792e32..41d46fa 100644 --- a/playbooks/pre.yml +++ b/playbooks/pre.yml @@ -1,11 +1,10 @@ --- - name: Pre tasks - part 1 - # hosts: all hosts: localhost connection: local vars: - working_directory: "{{ zuul.project.src_dir|default('~') }}" + working_directory: "{{ ansible_user_dir }}/src/github.com/osism/k8s-capi-images" tasks: - name: Run install script