Merge remote-tracking branch 'origin/develop'

Author: JelteF

automated_packaging/common_functions.pm

@@ -6,11 +6,31 @@ use JSON;
 
 # Export subroutines
 our @ISA = qw(Exporter);
-our @EXPORT = qw(get_and_verify_token get_sorted_prs create_release_changelog has_backport_label);
+our @EXPORT = qw(get_and_verify_token get_microsoft_email get_git_name get_sorted_prs create_release_changelog has_backport_label);
 
 # untaint environment
 local $ENV{'PATH'} = '/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin';
 
+sub get_microsoft_email {
+    unless (exists $ENV{MICROSOFT_EMAIL}) {
+        die "You must have a MICROSOFT_EMAIL set";
+    }
+
+    my $microsoft_email = $ENV{MICROSOFT_EMAIL};
+    return $microsoft_email;
+}
+
+sub get_git_name {
+    my $git_name = `git config user.name`;
+    # Strip trailing newline
+    chomp $git_name;
+    if ($git_name eq "") {
+        die "You must set your git name using 'git config user.name \"Your name Here\"'";
+    }
+    return $git_name;
+}
+
+
 sub get_and_verify_token {
     unless (exists $ENV{GITHUB_TOKEN}) {
         die "You must have a GITHUB_TOKEN set";

automated_packaging/update_docker.pl

@@ -61,8 +61,3 @@
 `git commit -a -m "Bump to version $VERSION"`;
 `git push origin release-$VERSION-$curTime`;
 `curl -g -H "Accept: application/vnd.github.v3.full+json" -X POST --user "$github_token:x-oauth-basic" -d '{\"title\":\"Bump docker to $VERSION\", \"base\":\"master\", \"head\":\"release-$VERSION-$curTime\"}' https://api.github.com/repos/citusdata/docker/pulls`;
-
-# Now push another and open a PR against develop
-`git checkout -b release-$VERSION-develop-$curTime`;
-`git push origin release-$VERSION-develop-$curTime`;
-`curl -g -H "Accept: application/vnd.github.v3.full+json" -X POST --user "$github_token:x-oauth-basic" -d '{\"title\":\"Bump docker to $VERSION\", \"base\":\"develop\", \"head\":\"release-$VERSION-develop-$curTime\"}' https://api.github.com/repos/citusdata/docker/pulls`;

automated_packaging/update_os_package.pl

@@ -16,11 +16,14 @@
 
 my $github_token = get_and_verify_token();
 
+my $microsoft_email = get_microsoft_email();
+my $git_name = get_git_name();
+
 # Debian branch has it's own changelog, we can get them through the CHANGELOG file of the code repo
 sub get_changelog_for_debian {
 
     # Update project spec file
-    @changelog_file = `curl --user "$github_token:x-oauth-basic" -H "Accept: application/vnd.github.v3.raw" -X GET 'https://api.github.com/repos/citusdata/$github_repo_name/contents/CHANGELOG.md' 2> /dev/null`;
+    @changelog_file = `curl --user "$github_token:x-oauth-basic" -H "Accept: application/vnd.github.v3.raw" -X GET 'https://api.github.com/repos/citusdata/$github_repo_name/contents/CHANGELOG.md?ref=v$VERSION' 2> /dev/null`;
 
     $first_version_has_seen = 0;
     my @changelog_items;
@@ -56,6 +59,8 @@ sub get_changelog_for_debian {
 
 # Checkout the distro's branch
 `git checkout $DISTRO_VERSION-$PROJECT`;
+# Update distro's branch
+`git pull origin $DISTRO_VERSION-$PROJECT`;
 
 # Create a new branch based on the distro's branch
 `git checkout -b $DISTRO_VERSION-$PROJECT-push-$curTime`;
@@ -64,12 +69,12 @@ sub get_changelog_for_debian {
 `sed -i 's/^pkglatest.*/pkglatest=$VERSION.citus-1/g' pkgvars`;
 
 # Based on the repo, update the package related variables
-if ( $DISTRO_VERSION eq "redhat" ) {
+if ( $DISTRO_VERSION eq "redhat" || $DISTRO_VERSION eq "microsoft" || $DISTRO_VERSION eq "all") {
     `sed -i 's|^Version:.*|Version:	$VERSION.citus|g' $github_repo_name.spec`;
-    `sed -i 's|^Source0:.*|Source0:       https:\/\/github.com\/citusdata\/$github_repo_name\/archive\/v$VERSION.tar.gz|g' $github_repo_name.spec`;
-    `sed -i 's|^%changelog|%changelog\\n* $abbr_day[$wday] $abbr_mon[$mon] $mday $year - Burak Velioglu <velioglub\@citusdata.com> $VERSION.citus-1\\n- Update to $log_repo_name $VERSION\\n|g' $github_repo_name.spec`;
+    `sed -i 's|^Source0:.*|Source0:	https:\/\/github.com\/citusdata\/$github_repo_name\/archive\/v$VERSION.tar.gz|g' $github_repo_name.spec`;
+    `sed -i 's|^%changelog|%changelog\\n* $abbr_day[$wday] $abbr_mon[$mon] $mday $year - $git_name <$microsoft_email> $VERSION.citus-1\\n- Update to $log_repo_name $VERSION\\n|g' $github_repo_name.spec`;
 }
-elsif ( $DISTRO_VERSION eq "debian" ) {
+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";
     my @lines = <DEB_CLOG_FILE>;
     close(DEB_CLOG_FILE);
@@ -82,12 +87,12 @@ sub get_changelog_for_debian {
     open( DEB_CLOG_FILE, ">./debian/changelog" ) || die "Debian changelog file not found";
     print DEB_CLOG_FILE "$github_repo_name ($VERSION.citus-1) stable; urgency=low\n";
     print DEB_CLOG_FILE @changelog_print;
-    print DEB_CLOG_FILE " -- Burak Velioglu <velioglub\@citusdata.com>  $abbr_day[$wday], $mday $abbr_mon[$mon] $year $print_hour:$min:$sec +0000\n\n";
+    print DEB_CLOG_FILE " -- $git_name <$microsoft_email>  $abbr_day[$wday], $mday $abbr_mon[$mon] $year $print_hour:$min:$sec +0000\n\n";
     print DEB_CLOG_FILE @lines;
     close(DEB_CLOG_FILE);
 }
 
 # 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\", \"head\":\"$DISTRO_VERSION-$PROJECT-push-$curTime\", \"base\":\"$DISTRO_VERSION-$PROJECT\"}' https://api.github.com/repos/citusdata/packaging/pulls`;
+`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`;

packaging/citus_package

@@ -371,6 +371,8 @@ foreach my $platform (@platforms) {
             "GITHUB_TOKEN",
             '-e',
             "PACKAGE_ENCRYPTION_KEY",
+            '-e',
+            "UNENCRYPTED_PACKAGE",
             "citus/packaging:$docker_platform-$pg",
             $build_type
         );

travis/build_new_nightly

@@ -9,7 +9,12 @@ stderr=2
 badusage=64
 
 latestpg="10"
-pkgflavor="${TRAVIS_BRANCH%%-*}"
+if [ "${TARGET_PLATFORM:-}" = "" ]; then
+    echo TARGET_PLATFORM must be set
+    exit $badusage
+fi
+
+PLATFORM_TYPE="${TARGET_PLATFORM%%/*}"
 pkgauth="${PACKAGECLOUD_API_TOKEN}:"
 hubauth="Authorization: token ${GITHUB_TOKEN}"
 
@@ -24,13 +29,13 @@ releasepg="${releasepg:-9.6,10}"
 nightlypg="${nightlypg:-${releasepg}}"
 latestpg=$(echo "${nightlypg}" | tr ',' '\n' | sort -t. -k1,1n -k2,2n | tail -n1)
 
-case "${pkgflavor}" in
-    debian)
+case "${PLATFORM_TYPE}" in
+    debian|ubuntu)
         pkgflavor='deb'
         pkgfull="postgresql-${latestpg}-${pkgname}"
         pkgarch="amd64"
         ;;
-    redhat)
+    el|ol)
         pkgflavor='rpm'
         pkgfull="${pkgname}_${latestpg//./}"
         pkgarch="x86_64"

travis/build_new_release

@@ -9,7 +9,12 @@ stderr=2
 badusage=64
 noservice=69
 
-pkgflavor="${TRAVIS_BRANCH%%-*}"
+if [ "${TARGET_PLATFORM:-}" = "" ]; then
+    echo TARGET_PLATFORM must be set
+    exit $badusage
+fi
+
+PLATFORM_TYPE="${TARGET_PLATFORM%%/*}"
 pkgauth="${PACKAGECLOUD_API_TOKEN}:"
 
 # populate variables from packaging metadata file
@@ -21,12 +26,12 @@ declare pkglatest # to make shellcheck happy
 hubproj="${hubproj:-${pkgname}}"
 nightlyref="${nightlyref:-master}"
 releasepg="${releasepg:-9.6,10}"
-nightlypg="${nightlypg:-${releasepg}}"
+nightlypg="${nightlypg:-}"
 latestpg=$(echo "${releasepg}" | tr ',' '\n' | sort -t. -k1,1n -k2,2n | tail -n1)
 versioning="${versioning:-simple}"
 
-case "${pkgflavor}" in
-    debian)
+case "${PLATFORM_TYPE}" in
+    debian|ubuntu)
         pkgflavor='deb'
         pkgfull="postgresql-${latestpg}-${pkgname}"
 
@@ -39,7 +44,7 @@ case "${pkgflavor}" in
         pkgarch="amd64"
         jqfilter='map(.version + "-" + .release)'
         ;;
-    redhat)
+    el|ol)
         pkgflavor='rpm'
 
         # add minor/major version to package name if using fancy versioning

travis/install_uncrustify

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-set -eux
+set -euxo pipefail
 
-uncrustifypkgs="$HOME/.cache/uncrustify_pkgs"
-uncrustifyversion="0.63"
-uncrustifydownload="uncrustify_${uncrustifyversion}-1_amd64.deb"
-uncrustifyurl="https://s3.amazonaws.com/packages.citusdata.com/travis/${uncrustifydownload}"
-
-# install travis uncrustify package
-wget -N -P "${uncrustifypkgs}" "${uncrustifyurl}"
-sudo dpkg --force-confdef --force-confold --install "${uncrustifypkgs}/${uncrustifydownload}"
+curl -L https://github.com/uncrustify/uncrustify/archive/uncrustify-0.68.1.tar.gz | tar xz
+cd uncrustify-uncrustify-0.68.1/
+mkdir build
+cd build
+cmake ..
+make -j5
+sudo make install
+cd ../..