PR#198: Update the config-check and config-update job - fedora-project-config

Tristan Cacqueray • 2 years ago

140a0a5

playbooks/config/check.yaml

file modified

+1 -1

		`@@ -92,7 +92,7 @@`

		`- name: Check nodepool dhall configuration`
		`shell: \|`
		`- for dhall_conf in $(ls nodepool/*.dhall 2> /dev/null); do`
		`+ for dhall_conf in $(ls nodepool/static_config/*.dhall 2> /dev/null); do`
		`echo ${dhall_conf}`
		`dhall-to-yaml --file ${dhall_conf} --output build/$(basename ${dhall_conf} .dhall).yaml \|\| exit 1`
		`done`

playbooks/config/config-update.yaml ~~playbooks/config/update.yaml~~

file renamed

file was moved with no change to the file

playbooks/config/update_local.yaml

file modified

+2 -2

		`@@ -9,7 +9,7 @@`
		`copy:`
		`content: "{{ site_install_server.ssh_private_key }}"`
		`dest: "{{ ssh_private_key_tmp.path }}"`
		`- mode: 0600`
		`+ mode: '0600'`

		`- name: Add zuul ssh key`
		`command: "ssh-add {{ ssh_private_key_tmp.path }}"`
		`@@ -23,4 +23,4 @@`
		`key: "{{ site_install_server.ssh_known_hosts }}"`

		`- name: run config update`
		`- command: "ssh root@{{ site_install_server.fqdn }} sf_configrepo_update {{ (zuul \| zuul_legacy_vars)['ZUUL_NEWREV'] }}"`
		`+ command: "ssh root@{{ site_install_server.fqdn }} config_update {{ (zuul \| zuul_legacy_vars)['ZUUL_NEWREV'] }}"`

playbooks/config/update_tenant.yaml

file modified

+2 -2

		`@@ -22,7 +22,7 @@`
		`copy:`
		`content: "{{ site_tenant_update.ssh_private_key }}"`
		`dest: "{{ ssh_private_key_tmp.path }}"`
		`- mode: 0600`
		`+ mode: '0600'`

		`- name: Add zuul ssh key`
		`command: "ssh-add {{ ssh_private_key_tmp.path }}"`
		`@@ -36,5 +36,5 @@`
		`key: "{{ site_tenant_update.ssh_known_hosts }}"`

		`- name: Run tenant_update`
		`- command: "ssh root@{{ site_tenant_update.fqdn }} sf_tenant_update"`
		`+ command: "ssh root@{{ site_tenant_update.fqdn }} tenant_update"`
		`when: git_log_resources.stdout == git_log.stdout`

zuul.d/_jobs-base.yaml

file modified

+1 -1

		`@@ -51,7 +51,7 @@`
		`allowed-projects:`
		`- fedora-project-config`
		`description: Deploy config repo update.`
		`- run: playbooks/config/update.yaml`
		`+ run: playbooks/config/config-update.yaml`
		`secrets:`
		`- site_install_server`
		`- site_tenant_update`