From e13efacc0f41eba8f77cd19c9eebe43fd4ff0d65 Mon Sep 17 00:00:00 2001 From: Nitesh Konkar Date: Tue, 17 Sep 2019 20:52:03 +0530 Subject: [PATCH 1/2] obs: docker: update opensuse base image Leap 42.3 is now depreceated. Update it to 15.1 Fixes: #704 Signed-off-by: Nitesh Konkar --- obs-packaging/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obs-packaging/Dockerfile b/obs-packaging/Dockerfile index a797b617f7..4e3e6b755d 100644 --- a/obs-packaging/Dockerfile +++ b/obs-packaging/Dockerfile @@ -1,4 +1,4 @@ -ARG SUSE_VERSION=${SUSE_VERSION:-42.3} +ARG SUSE_VERSION=${SUSE_VERSION:-15.1} FROM opensuse/leap:${SUSE_VERSION} From 55713619559e8dd857d9dcd7a9f1bcaee079183e Mon Sep 17 00:00:00 2001 From: Nitesh Konkar Date: Fri, 6 Sep 2019 23:32:51 +0530 Subject: [PATCH 2/2] create-repo-branch: Alpha is the branch for ppc64le x86 has "releases" as the release branch. For ppc64le, we have "alpha" branch. Update the scripts for the same. Fixes: #704 Signed-off-by: Nitesh Konkar --- obs-packaging/create-repo-branch.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/obs-packaging/create-repo-branch.sh b/obs-packaging/create-repo-branch.sh index 8fd3e6c6e6..f3c734694b 100755 --- a/obs-packaging/create-repo-branch.sh +++ b/obs-packaging/create-repo-branch.sh @@ -153,9 +153,12 @@ main() { [ -n "${branch}" ] || usage "missing branch" "1" if [ "${create_ci_subproject:-false}" == "true" ];then release_type="ci" + elif [ "$arch_target" == "ppc64le" ]; then + release_type="alpha" else release_type="releases" fi + project_branch="${home_project}:${release_type}:${arch_target}:${branch}" create_meta_xml "${project_branch}" "${branch}" info "Creating/Updating project with name ${project_branch}"