Some improvements of update_os_package.pl

* Handles $DISTRO_VERSION "all" better
* Branch name includes $VERSION

Author: JelteF

automated_packaging/update_os_package.pl

@@ -9,6 +9,7 @@
 # Name of the repo is represented differently on logs and repos
 my $github_repo_name = "citus";
 my $log_repo_name = "Citus";
+my $version_suffix = ".citus";
 if ( $PROJECT eq "enterprise" ) {
     $github_repo_name = "citus-enterprise";
     $log_repo_name = "Citus Enterprise";
@@ -18,11 +19,13 @@
     $github_repo_name = "pg_auto_failover";
     $package_name = "pg-auto-failover";
     $log_repo_name = "pg_auto_failover";
+    $version_suffix = "";
 }
 if ( $PROJECT eq "pgautofailover-enterprise" ) {
     $github_repo_name = "citus-ha";
     $package_name = "pg-auto-failover-enterprise";
     $log_repo_name = "pg_auto_failover enterprise";
+    $version_suffix = "";
 }
 
 my $github_token = get_and_verify_token();
@@ -67,23 +70,25 @@ sub get_changelog_for_debian {
 
 # Necessary to create unique branch
 $curTime = time();
+my $main_branch = "$DISTRO_VERSION-$PROJECT";
+my $pr_branch = "$DISTRO_VERSION-$PROJECT-$VERSION-push-$curTime";
 
 # Checkout the distro's branch
-`git checkout $DISTRO_VERSION-$PROJECT`;
+`git checkout $main_branch`;
 # Update distro's branch
-`git pull origin $DISTRO_VERSION-$PROJECT`;
+`git pull origin $main_branch`;
 
 # Create a new branch based on the distro's branch
-`git checkout -b $DISTRO_VERSION-$PROJECT-push-$curTime`;
+`git checkout -b $pr_branch`;
 
 # Update pkgvars
-`sed -i 's/^pkglatest.*/pkglatest=$VERSION.citus-1/g' pkgvars`;
+`sed -i 's/^pkglatest.*/pkglatest=$VERSION$version_suffix-1/g' pkgvars`;
 
 # Based on the repo, update the package related variables
 if ( $DISTRO_VERSION eq "redhat" || $DISTRO_VERSION eq "microsoft" || $DISTRO_VERSION eq "all") {
-    `sed -i 's|^Version:.*|Version:	$VERSION.citus|g' $package_name.spec`;
+    `sed -i 's|^Version:.*|Version:	$VERSION$version_suffix|g' $package_name.spec`;
     `sed -i 's|^Source0:.*|Source0:	https:\/\/github.com\/citusdata\/$package_name\/archive\/v$VERSION.tar.gz|g' $package_name.spec`;
-    `sed -i 's|^%changelog|%changelog\\n* $abbr_day[$wday] $abbr_mon[$mon] $mday $year - $git_name <$microsoft_email> $VERSION.citus-1\\n- Official $VERSION release of $log_repo_name\\n|g' $package_name.spec`;
+    `sed -i 's|^%changelog|%changelog\\n* $abbr_day[$wday] $abbr_mon[$mon] $mday $year - $git_name <$microsoft_email> $VERSION$version_suffix-1\\n- Official $VERSION release of $log_repo_name\\n|g' $package_name.spec`;
 }
 if ( $DISTRO_VERSION eq "debian" || $DISTRO_VERSION eq "microsoft" || $DISTRO_VERSION eq "all") {
     open( DEB_CLOG_FILE, "<./debian/changelog" ) || die "Debian changelog file not found";
@@ -99,7 +104,7 @@ sub get_changelog_for_debian {
 
     # Update the changelog file of the debian branch
     open( DEB_CLOG_FILE, ">./debian/changelog" ) || die "Debian changelog file not found";
-    print DEB_CLOG_FILE "$package_name ($VERSION.citus-1) stable; urgency=low\n";
+    print DEB_CLOG_FILE "$package_name ($VERSION$version_suffix-1) stable; urgency=low\n";
     if ($PROJECT eq 'citus' || $PROJECT eq 'enterprise') {
         print DEB_CLOG_FILE @changelog_print;
     }
@@ -112,7 +117,13 @@ sub get_changelog_for_debian {
     close(DEB_CLOG_FILE);
 }
 
+
+my $commit_message_distro_version = "$DISTRO_VERSION ";
+if ($DISTRO_VERSION eq "all") {
+    $commit_message_distro_version = "";
+}
 # Commit, push changes and open a pull request
-`git commit -a -m "Bump $DISTRO_VERSION $log_repo_name $VERSION"`;
-`git push origin $DISTRO_VERSION-$PROJECT-push-$curTime`;
-`curl -g -H "Accept: application/vnd.github.v3.full+json" -X POST --user "$github_token:x-oauth-basic" -d '{\"title\":\"Bump $PROJECT $DISTRO_VERSION version to $VERSION\", \"head\":\"$DISTRO_VERSION-$PROJECT-push-$curTime\", \"base\":\"$DISTRO_VERSION-$PROJECT\"}' https://api.github.com/repos/citusdata/packaging/pulls`;
+my $commit_message = "Bump $commit_message_distro_version$log_repo_name version to $VERSION";
+`git commit -a -m "$commit_message"`;
+`git push origin $pr_branch`;
+`curl -g -H "Accept: application/vnd.github.v3.full+json" -X POST --user "$github_token:x-oauth-basic" -d '{\"title\":\"$commit_message\", \"head\":\"$pr_branch\", \"base\":\"$main_branch\"}' https://api.github.com/repos/citusdata/packaging/pulls`;