From 5cf829cb00911cca78584a3ca62b50cd3e49aed1 Mon Sep 17 00:00:00 2001 From: ArkadiuszX Szczepanek Date: Fri, 21 Jul 2023 08:37:07 +0200 Subject: [PATCH 1/2] Update configure runner and opensuse setup scripts --- utils/ansible/configure-self-hosted-runner.yml | 12 ++++++++++-- utils/ansible/opensuse-setup.yml | 3 --- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/utils/ansible/configure-self-hosted-runner.yml b/utils/ansible/configure-self-hosted-runner.yml index 40542ba3df5..986b4a24b59 100644 --- a/utils/ansible/configure-self-hosted-runner.yml +++ b/utils/ansible/configure-self-hosted-runner.yml @@ -37,7 +37,7 @@ # connection: local vars: testUser: pmdkuser - package_url: https://github.com/actions/runner/releases/download/v2.304.0/actions-runner-linux-x64-2.304.0.tar.gz + package_url: https://github.com/actions/runner/releases/download/v2.306.0/actions-runner-linux-x64-2.306.0.tar.gz runner_folder: /home/{{ testUser }}/actions-runner repo_url: https://github.com/pmem/pmdk vars_list: "{{ vars_gha.split(',') }}" @@ -59,7 +59,15 @@ remote_src: yes - name: "Change owner to {{ testUser }}" - shell: chown -R {{ testUser }} {{ runner_folder }} + shell: chown -R $(id -u {{ testUser }}).$(id -g {{ testUser }}) {{ runner_folder }} + + # Make sure the following environment variables are present in the env + # to ensure propagation to the actions-runner environment. + - name: "Add env variables into env.sh checklist" + lineinfile: + path: "{{ runner_folder }}/env.sh" + line: " 'PKG_CONFIG_PATH'\n 'HOME'" + insertafter: "^varCheckList=\\(" - name: "Add runner to GHA" shell: | diff --git a/utils/ansible/opensuse-setup.yml b/utils/ansible/opensuse-setup.yml index 92a614b19df..8419b825777 100644 --- a/utils/ansible/opensuse-setup.yml +++ b/utils/ansible/opensuse-setup.yml @@ -145,9 +145,6 @@ - name: "Install valgrind from source" script: ../docker/images/install-valgrind.sh - - name: "Run the install-libndctl script with arguments" - script: ../docker/images/install-libndctl.sh tags/v70.1 - # Disable AppArmor. # AppArmor may block proper GHA runner installation and startup. # ==`Suse` condition is inherited from the original version of From 1973463b217a2d82a59a837c3bee3d9461ec65f4 Mon Sep 17 00:00:00 2001 From: ArkadiuszX Szczepanek Date: Mon, 24 Jul 2023 09:17:59 +0200 Subject: [PATCH 2/2] common: Update configure runner and opensuse setup scripts --- utils/ansible/configure-self-hosted-runner.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/utils/ansible/configure-self-hosted-runner.yml b/utils/ansible/configure-self-hosted-runner.yml index 986b4a24b59..8365e6b0626 100644 --- a/utils/ansible/configure-self-hosted-runner.yml +++ b/utils/ansible/configure-self-hosted-runner.yml @@ -59,15 +59,18 @@ remote_src: yes - name: "Change owner to {{ testUser }}" - shell: chown -R $(id -u {{ testUser }}).$(id -g {{ testUser }}) {{ runner_folder }} + shell: chown -R $(id -u {{ testUser }}):$(id -g {{ testUser }}) {{ runner_folder }} # Make sure the following environment variables are present in the env - # to ensure propagation to the actions-runner environment. + # to ensure propagation to the actions-runner's environment. - name: "Add env variables into env.sh checklist" lineinfile: path: "{{ runner_folder }}/env.sh" - line: " 'PKG_CONFIG_PATH'\n 'HOME'" + line: " '{{ item.line }}'" insertafter: "^varCheckList=\\(" + loop: + - line: PKG_CONFIG_PATH + - line: HOME - name: "Add runner to GHA" shell: |