From 34a6360afd5185566cf6f53b831d4baf72c6e7a7 Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Tue, 17 Sep 2024 09:10:08 +0200 Subject: [PATCH] Use zuul.build instead of zuul.change in os access job (#44) Signed-off-by: Artem Goncharov --- playbooks/openstack/post.yaml | 2 +- playbooks/openstack/pre.yaml | 6 +++--- zuul.d/jobs.yaml | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/playbooks/openstack/post.yaml b/playbooks/openstack/post.yaml index bd0595d..3c8422d 100644 --- a/playbooks/openstack/post.yaml +++ b/playbooks/openstack/post.yaml @@ -17,5 +17,5 @@ - name: "Drop temporary credentials by name" openstack_application_credentials: cloud: "{{ cloud_config.config }}" - name: "functest_{{ zuul.change }}" + name: "functest_{{ zuul.build }}" state: "absent" diff --git a/playbooks/openstack/pre.yaml b/playbooks/openstack/pre.yaml index 892db90..00f3f58 100644 --- a/playbooks/openstack/pre.yaml +++ b/playbooks/openstack/pre.yaml @@ -36,7 +36,7 @@ delegate_to: localhost openstack_application_credentials: cloud: "{{ cloud_config.config }}" - name: "functest_{{ zuul.change }}" + name: "functest_{{ zuul.build }}" register: app_cred - name: Ensure openstack directory exists @@ -51,11 +51,11 @@ ansible.builtin.template: src: "templates/clouds.yaml.j2" dest: "/etc/openstack/clouds.yaml" - mode: "0400" + mode: "0440" - name: Create secure.yaml become: true ansible.builtin.template: src: "templates/secure.yaml.j2" dest: "/etc/openstack/secure.yaml" - mode: "0400" + mode: "0440" diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 46277f2..392453c 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -48,10 +48,13 @@ parent: base pre-run: playbooks/openstack/pre.yaml post-run: playbooks/openstack/post.yaml + post-review: True semaphores: - semaphore-openstack-access allowed-projects: - SovereignCloudStack/zuul-config + - SovereignCloudStack/k8s-cluster-api-provider + - SovereignCloudStack/cluster-stacks vars: cloud: "gx-scs-zuul" vault_cloud_path: "clouds/gx_scs_k8s_e2e"