Remove hardcoded dist- value

Instead of hardcoding dist-, just add into $TAG_NAME in parameter.sh Signed-off-by: candrew <[email protected]>
clearlinux · Oct 25, 2019 · 4b06ff5 · 4b06ff5
1 parent ecdb82a
commit 4b06ff5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/koji-setup/bootstrap-build.sh b/koji-setup/bootstrap-build.sh
@@ -14,19 +14,19 @@ if [[ -n "$SRC_RPM_DIR" && -n "$BIN_RPM_DIR" ]]; then
 		find "$DEBUG_RPM_DIR" -name "*.$RPM_ARCH.rpm" | xargs -n 1 -I {} sudo -u kojiadmin koji import {}
 	fi
 fi
-sudo -u kojiadmin koji add-tag dist-"$TAG_NAME"
-sudo -u kojiadmin koji edit-tag dist-"$TAG_NAME" -x mock.package_manager=dnf
+sudo -u kojiadmin koji add-tag "$TAG_NAME"
+sudo -u kojiadmin koji edit-tag "$TAG_NAME" -x mock.package_manager=dnf
 if [[ -n "$SRC_RPM_DIR" && -n "$BIN_RPM_DIR" ]]; then
-	sudo -u kojiadmin koji list-pkgs --quiet | xargs -I {} sudo -u kojiadmin koji add-pkg --owner kojiadmin dist-"$TAG_NAME" {}
-	sudo -u kojiadmin koji list-untagged | xargs -n 1 -I {} sudo -u kojiadmin koji call tagBuildBypass dist-"$TAG_NAME" {}
+	sudo -u kojiadmin koji list-pkgs --quiet | xargs -I {} sudo -u kojiadmin koji add-pkg --owner kojiadmin "$TAG_NAME" {}
+	sudo -u kojiadmin koji list-untagged | xargs -n 1 -I {} sudo -u kojiadmin koji call tagBuildBypass "$TAG_NAME" {}
 fi
-sudo -u kojiadmin koji add-tag --parent dist-"$TAG_NAME" --arches "$RPM_ARCH" dist-"$TAG_NAME"-build
-sudo -u kojiadmin koji add-target dist-"$TAG_NAME" dist-"$TAG_NAME"-build
-sudo -u kojiadmin koji add-group dist-"$TAG_NAME"-build build
-sudo -u kojiadmin koji add-group dist-"$TAG_NAME"-build srpm-build
-sudo -u kojiadmin koji add-group-pkg dist-"$TAG_NAME"-build build autoconf automake automake-dev binutils bzip2 clr-rpm-config coreutils diffutils gawk gcc gcc-dev gettext gettext-bin git glibc-dev glibc-locale glibc-utils grep gzip hostname libc6-dev libcap libtool libtool-dev linux-libc-headers m4 make netbase nss-altfiles patch pigz pkg-config pkg-config-dev rpm-build sed sed-doc shadow systemd-lib tar unzip which xz
-sudo -u kojiadmin koji add-group-pkg dist-"$TAG_NAME"-build srpm-build coreutils cpio curl-bin git glibc-utils grep gzip make pigz plzip rpm-build sed shadow tar unzip wget xz
+sudo -u kojiadmin koji add-tag --parent "$TAG_NAME" --arches "$RPM_ARCH" "$TAG_NAME"-build
+sudo -u kojiadmin koji add-target "$TAG_NAME" "$TAG_NAME"-build
+sudo -u kojiadmin koji add-group "$TAG_NAME"-build build
+sudo -u kojiadmin koji add-group "$TAG_NAME"-build srpm-build
+sudo -u kojiadmin koji add-group-pkg "$TAG_NAME"-build build autoconf automake automake-dev binutils bzip2 clr-rpm-config coreutils diffutils gawk gcc gcc-dev gettext gettext-bin git glibc-dev glibc-locale glibc-utils grep gzip hostname libc6-dev libcap libtool libtool-dev linux-libc-headers m4 make netbase nss-altfiles patch pigz pkg-config pkg-config-dev rpm-build sed sed-doc shadow systemd-lib tar unzip which xz
+sudo -u kojiadmin koji add-group-pkg "$TAG_NAME"-build srpm-build coreutils cpio curl-bin git glibc-utils grep gzip make pigz plzip rpm-build sed shadow tar unzip wget xz
 if [[ -n "$EXTERNAL_REPO" ]]; then
-	sudo -u kojiadmin koji add-external-repo -t dist-"$TAG_NAME"-build dist-"$TAG_NAME"-external-repo "$EXTERNAL_REPO"
+	sudo -u kojiadmin koji add-external-repo -t "$TAG_NAME"-build "$TAG_NAME"-external-repo "$EXTERNAL_REPO"
 fi
-sudo -u kojiadmin koji regen-repo dist-"$TAG_NAME"-build
+sudo -u kojiadmin koji regen-repo "$TAG_NAME"-build
diff --git a/koji-setup/deploy-mash.sh b/koji-setup/deploy-mash.sh
@@ -37,7 +37,7 @@ source_path = source/SRPMS
 debuginfo = True
 multilib = False
 multilib_method = devel
-tag = dist-$TAG_NAME
+tag = $TAG_NAME
 inherit = True
 strict_keys = False
 arches = $RPM_ARCH