From 37a0afef4e67f35ea8495fc8e6b7fd2473ce7ae9 Mon Sep 17 00:00:00 2001 From: Aleksandra Fedorova Date: Nov 17 2022 12:52:54 +0000 Subject: Zuul project name has full path included According to the docs https://zuul-ci.org/docs/zuul/latest/job-content.html#var-zuul.project.name project.name has full path to the repo excluding the host name, thus the URL needs to be simplified. Relates-To: CS-1290 --- diff --git a/roles/centpkg-fetch-sources/tasks/main.yaml b/roles/centpkg-fetch-sources/tasks/main.yaml index b85f754..05b0980 100644 --- a/roles/centpkg-fetch-sources/tasks/main.yaml +++ b/roles/centpkg-fetch-sources/tasks/main.yaml @@ -10,7 +10,7 @@ args: chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}" loop: - - git remote set-url origin https://gitlab.com/redhat/centos-stream/rpms/{{ zuul.project.name }} + - git remote set-url origin https://gitlab.com/{{ zuul.project.name }} - git branch -u origin/{{ release }} - name: Build the package SRPM diff --git a/roles/centpkg-srpm-build/tasks/main.yaml b/roles/centpkg-srpm-build/tasks/main.yaml index 99671e8..151ab3b 100644 --- a/roles/centpkg-srpm-build/tasks/main.yaml +++ b/roles/centpkg-srpm-build/tasks/main.yaml @@ -10,7 +10,7 @@ args: chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}" loop: - - git remote set-url origin https://gitlab.com/redhat/centos-stream/rpms/{{ zuul.project.name }} + - git remote set-url origin https://gitlab.com/{{ zuul.project.name }} - git branch -u origin/{{ release }} - name: Build the package SRPM