Skip to content

Commit ad2d301

Browse files
brianwykabrianwyka
committed
Attempted debian/rpm publish fixes for 409s
1 parent 1b82234 commit ad2d301

File tree

5 files changed

+53
-33
lines changed

5 files changed

+53
-33
lines changed

‎distributions/debian/pom.xml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
<debian.build.directory>${project.build.directory}/debian</debian.build.directory>
2222
<debian.package>${bintray.package}</debian.package>
2323
<debian.package.version>${project.version}~${git.commit.time}+${git.commit.id.abbrev}</debian.package.version>
24-
<debian.deb.repository>deb-dev</debian.deb.repository>
25-
<debian.ubuntu.repository>ubuntu-dev</debian.ubuntu.repository>
2624
<debian.architecture>amd64</debian.architecture>
2725
</properties>
2826

@@ -52,6 +50,13 @@
5250
<plugin>
5351
<groupId>pl.project13.maven</groupId>
5452
<artifactId>git-commit-id-plugin</artifactId>
53+
<configuration>
54+
<dateFormat>${maven.build.timestamp.format}</dateFormat>
55+
<dotGitDirectory>${maven.multiModuleProjectDirectory}/.git</dotGitDirectory>
56+
<skipPoms>false</skipPoms>
57+
<generateGitPropertiesFile>true</generateGitPropertiesFile>
58+
<generateGitPropertiesFilename>${project.build.directory}/git.properties</generateGitPropertiesFilename>
59+
</configuration>
5560
</plugin>
5661

5762
<!-- FILTER RESOURCES TO INJECT MAVEN PROPERTIES INTO PLACEHOLDERS -->
@@ -301,7 +306,6 @@
301306
<configuration>
302307
<environmentVariables combine.children="append">
303308
<BINTRAY_REPOSITORY_OVERRIDE>dev-snapshots</BINTRAY_REPOSITORY_OVERRIDE>
304-
<BINTRAY_UPLOAD_PATH>${debian.architecture}/${debian.package.version}/${debian.package}-${debian.package.version}-${debian.architecture}.deb</BINTRAY_UPLOAD_PATH>
305309
</environmentVariables>
306310
</configuration>
307311
</plugin>
@@ -355,12 +359,11 @@
355359
<phase>deploy</phase>
356360
<configuration>
357361
<executable>${project.basedir}/scripts/publish-package-version-to-bintray.sh</executable>
358-
<arguments>
362+
<environmentVariables>
359363
<PACKAGE_FILE_PATH>${project.build.directory}/${debian.package}-ubuntu-focal.deb</PACKAGE_FILE_PATH>
360-
<argument>ubuntu</argument>
361-
<BINTRAY_REPOSITORY>${debian.package}</BINTRAY_REPOSITORY>
364+
<BINTRAY_REPOSITORY>ubuntu</BINTRAY_REPOSITORY>
362365
<BINTRAY_DISTRIBUTIONS>focal</BINTRAY_DISTRIBUTIONS>
363-
</arguments>
366+
</environmentVariables>
364367
</configuration>
365368
</execution>
366369
</executions>

‎distributions/debian/scripts/publish-package-version-to-bintray.sh‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
##############################################################################
44
#
5-
# Publish Debian packages to Bintray
5+
# Publish Debian Package Versions to Bintray
66
#
77
# Packages
8+
# - https://bintray.com/beta/#/optum/dev-snapshots/sourcehawk
89
# - https://bintray.com/beta/#/optum/deb/sourcehawk
910
# - https://bintray.com/beta/#/optum/ubuntu/sourcehawk
1011
#
@@ -15,13 +16,13 @@ set -e
1516
# Script Environment / Arguments
1617
PACKAGE_FILE_PATH="${PACKAGE_FILE_PATH:-1}"
1718
BINTRAY_ORGANIZATION="${BINTRAY_ORGANIZATION:-2}"
19+
BINTRAY_RELEASE_REPOSITORY="${BINTRAY_REPOSITORY:-3}"
1820
[ -n "${BINTRAY_REPOSITORY_OVERRIDE}" ] && BINTRAY_REPOSITORY="${BINTRAY_REPOSITORY_OVERRIDE}"
1921
BINTRAY_REPOSITORY="${BINTRAY_REPOSITORY:-3}"
2022
BINTRAY_PACKAGE="${BINTRAY_PACKAGE:-4}"
2123
PACKAGE_VERSION="${PACKAGE_VERSION:-5}"
22-
PACKAGE_RELEASE="${PACKAGE_RELEASE:-6}"
23-
BINTRAY_DISTRIBUTIONS="${BINTRAY_DISTRIBUTIONS:-7}"
24-
BINTRAY_ARCHITECTURES="${BINTRAY_ARCHITECTURES:-8}"
24+
BINTRAY_DISTRIBUTIONS="${BINTRAY_DISTRIBUTIONS:-6}"
25+
BINTRAY_ARCHITECTURES="${BINTRAY_ARCHITECTURES:-7}"
2526

2627
# Bintray Variables
2728
BINTRAY_API_URL="https://api.bintray.com"
@@ -30,19 +31,29 @@ BINTRAY_PACKAGE_VERSION="${PACKAGE_VERSION//"-SNAPSHOT"/}" # Remove "-SNAPSHOT"
3031
BINTRAY_PACKAGE_BASE_VERSION="$(echo "$BINTRAY_PACKAGE_VERSION" | cut -f1 -d'~')"
3132
BINTRAY_PRIMARY_ARCHITECTURE=$(echo "$BINTRAY_ARCHITECTURES" | cut -d',' -f1)
3233

33-
BINTRAY_UPLOAD_PATH="${BINTRAY_UPLOAD_PATH:-"pool/$BINTRAY_COMPONENT/$(echo "$BINTRAY_PACKAGE" | cut -c1-1)/$BINTRAY_PACKAGE_BASE_VERSION/$BINTRAY_PACKAGE-$BINTRAY_REPOSITORY-$BINTRAY_PACKAGE_VERSION-$BINTRAY_PRIMARY_ARCHITECTURE.deb"}"
34+
# Construct the upload path
35+
BINTRAY_UPLOAD_PATH="pool/$BINTRAY_COMPONENT/$(echo "$BINTRAY_PACKAGE" | cut -c1-1)/$BINTRAY_PACKAGE_BASE_VERSION/$BINTRAY_PACKAGE-$BINTRAY_REPOSITORY-$BINTRAY_PACKAGE_VERSION-$BINTRAY_PRIMARY_ARCHITECTURE.deb"
36+
if [[ "$BINTRAY_REPOSITORY" == "dev-snapshots" ]]; then
37+
BINTRAY_UPLOAD_PATH="$BINTRAY_PACKAGE_BASE_VERSION/$BINTRAY_PACKAGE-$BINTRAY_PACKAGE_VERSION-$BINTRAY_RELEASE_REPOSITORY-$BINTRAY_PRIMARY_ARCHITECTURE.deb"
38+
fi
3439
BINTRAY_UPLOAD_PATH="${BINTRAY_UPLOAD_PATH//"-SNAPSHOT"/}" # Remove "-SNAPSHOT" from Upload Path
3540

3641
# Construct the URL for publishing
37-
BINTRAY_PUBLISH_URL="$BINTRAY_API_URL/content/$BINTRAY_ORGANIZATION/$BINTRAY_REPOSITORY/$BINTRAY_PACKAGE/$BINTRAY_PACKAGE_VERSION/$BINTRAY_UPLOAD_PATH;publish=1"
42+
BINTRAY_PUBLISH_URL="$BINTRAY_API_URL/content/$BINTRAY_ORGANIZATION/$BINTRAY_REPOSITORY/$BINTRAY_PACKAGE/$BINTRAY_PACKAGE_VERSION/$BINTRAY_UPLOAD_PATH"
3843
if [[ "$BINTRAY_REPOSITORY" != "dev-snapshots" ]]; then
39-
BINTRAY_PUBLISH_URL="${BINTRAY_PUBLISH_URL};deb_distribution=$BINTRAY_DISTRIBUTIONS;deb_component=$BINTRAY_COMPONENT;deb_architecture=$BINTRAY_ARCHITECTURES"
44+
BINTRAY_PUBLISH_URL="${BINTRAY_PUBLISH_URL};publish=1;deb_distribution=$BINTRAY_DISTRIBUTIONS;deb_component=$BINTRAY_COMPONENT;deb_architecture=$BINTRAY_ARCHITECTURES"
4045
fi
4146

4247
# Publish Package
43-
echo "Publishing package to $BINTRAY_PUBLISH_URL..."
44-
#curl -sfLS -X PUT -T "$PACKAGE_FILE_PATH" -u "${BINTRAY_USERNAME}:${BINTRAY_API_KEY}" "$BINTRAY_PUBLISH_URL"
48+
echo "Publishing Debian package to: $BINTRAY_PUBLISH_URL"
49+
echo -n "Response: "
50+
curl -sfLS -X PUT -T "$PACKAGE_FILE_PATH" -H "Accept: application/json" -u "${BINTRAY_USERNAME}:${BINTRAY_API_KEY}" "$BINTRAY_PUBLISH_URL"
51+
echo " "
4552

46-
# Calculate Metadata for Package Repository
47-
echo "Forcing metadata calculation..."
48-
#curl -sfLS -X POST -u "${BINTRAY_USERNAME}:${BINTRAY_API_KEY}" "$BINTRAY_API_URL/calc_metadata/$BINTRAY_ORGANIZATION/$BINTRAY_REPOSITORY"
53+
if [[ "$BINTRAY_REPOSITORY" != "dev-snapshots" ]]; then
54+
# Calculate Metadata for Debian Package Repository
55+
echo "Forcing metadata calculation..."
56+
echo -n "Response: "
57+
curl -sfLS -X POST -u "${BINTRAY_USERNAME}:${BINTRAY_API_KEY}" "$BINTRAY_API_URL/calc_metadata/$BINTRAY_ORGANIZATION/$BINTRAY_REPOSITORY"
58+
echo " "
59+
fi

‎distributions/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
<properties>
2121
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
2222
<docker.repository>${docker.organization}/${global.project.name}</docker.repository>
23-
<!-- <git.commit.time/> &lt;!&ndash; Filled in by git-commitid-plugin &ndash;&gt;-->
24-
<!-- <git.commit.id.abbrev/> &lt;!&ndash; Filled in by git-commitid-plugin &ndash;&gt;-->
2523
</properties>
2624

2725
<dependencyManagement>

‎distributions/rpm/scripts/publish-package-version-to-bintray.sh‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ set -e
1515
# Script Environment / Arguments
1616
PACKAGE_FILE_PATH="${PACKAGE_FILE_PATH:-1}"
1717
BINTRAY_ORGANIZATION="${BINTRAY_ORGANIZATION:-2}"
18+
BINTRAY_RELEASE_REPOSITORY="${BINTRAY_REPOSITORY:-3}"
1819
[ -n "${BINTRAY_REPOSITORY_OVERRIDE}" ] && BINTRAY_REPOSITORY="${BINTRAY_REPOSITORY_OVERRIDE}"
1920
BINTRAY_REPOSITORY="${BINTRAY_REPOSITORY:-3}"
2021
BINTRAY_PACKAGE="${BINTRAY_PACKAGE:-4}"
@@ -26,12 +27,19 @@ BINTRAY_ARCHITECTURE="${BINTRAY_ARCHITECTURE:-7}"
2627
BINTRAY_API_URL="https://api.bintray.com"
2728
BINTRAY_PACKAGE_BASE_VERSION="${PACKAGE_VERSION//"-SNAPSHOT"/}" # Remove "-SNAPSHOT" from Package Version
2829
BINTRAY_PACKAGE_VERSION="$BINTRAY_PACKAGE_BASE_VERSION-$PACKAGE_RELEASE" # Append Release Metadata
29-
BINTRAY_UPLOAD_PATH="${BINTRAY_UPLOAD_PATH:-"$BINTRAY_PACKAGE_BASE_VERSION/$BINTRAY_PACKAGE-$BINTRAY_PACKAGE_VERSION-$BINTRAY_ARCHITECTURE.rpm"}"
30+
31+
# Construct the upload path
32+
BINTRAY_UPLOAD_PATH="$BINTRAY_PACKAGE_BASE_VERSION/$BINTRAY_PACKAGE-$BINTRAY_PACKAGE_VERSION-$BINTRAY_ARCHITECTURE.rpm"
33+
if [[ "$BINTRAY_REPOSITORY" == "dev-snapshots" ]]; then
34+
BINTRAY_UPLOAD_PATH="$BINTRAY_PACKAGE_BASE_VERSION/$BINTRAY_PACKAGE-$BINTRAY_PACKAGE_VERSION-$BINTRAY_RELEASE_REPOSITORY-$BINTRAY_ARCHITECTURE.rpm"
35+
fi
3036
BINTRAY_UPLOAD_PATH="${BINTRAY_UPLOAD_PATH//"-SNAPSHOT"/}" # Remove "-SNAPSHOT" from Upload Path
3137

3238
# Construct the URL for publishing
3339
BINTRAY_PUBLISH_URL="$BINTRAY_API_URL/content/$BINTRAY_ORGANIZATION/$BINTRAY_REPOSITORY/$BINTRAY_PACKAGE/$BINTRAY_PACKAGE_VERSION/$BINTRAY_UPLOAD_PATH;publish=1"
3440

3541
# Publish Package
36-
echo "Publishing package to $BINTRAY_PUBLISH_URL..."
37-
curl -sfLS -X PUT -T "$PACKAGE_FILE_PATH" -u "${BINTRAY_USERNAME}:${BINTRAY_API_KEY}" "$BINTRAY_PUBLISH_URL"
42+
echo "Publishing RPM package to $BINTRAY_PUBLISH_URL"
43+
echo -n "Response: "
44+
curl -sfLS -X PUT -T "$PACKAGE_FILE_PATH" -H "Accept: application/json" -u "${BINTRAY_USERNAME}:${BINTRAY_API_KEY}" "$BINTRAY_PUBLISH_URL"
45+
echo " "

‎distributions/scripts/build-and-push-docker-builders-to-bintray.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
set -e
1010

11-
DIR="$( cd "$( dirname "$( dirname "$( dirname "${BASH_SOURCE[0]}" )")")" && pwd )"
12-
DOCKER_BUILDERS_DIR="${DIR}../docker-builders"
11+
ROOT_DIR="$( cd "$( dirname "$( dirname "$( dirname "${BASH_SOURCE[0]}" )")")" && pwd )"
12+
DOCKER_BUILDERS_DIR="$ROOT_DIR/distributions/docker-builders"
1313

1414
# Bintray Variables
1515
BINTRAY_API_URL="https://api.bintray.com"
@@ -18,15 +18,15 @@ BINTRAY_REPO="builders"
1818
REGISTRY="optum-docker-builders.bintray.io"
1919

2020
# Native Image
21-
docker build -t $REGISTRY/nativeimage:graalvm-ce-20.3.0-java8 -f "$DOCKER_BUILDERS_DIR"/Dockerfile-nativeimage --build-arg FROM=oracle/graalvm-ce:20.3.0-java8 .
22-
docker build -t $REGISTRY/nativeimage:graalvm-ce-20.3.0-java11 -f "$DOCKER_BUILDERS_DIR"/Dockerfile-nativeimage --build-arg FROM=oracle/graalvm-ce:20.3.0-java11 .
21+
docker build -t $REGISTRY/nativeimage:graalvm-ce-20.3.0-java8 -f "$DOCKER_BUILDERS_DIR/Dockerfile-nativeimage" --build-arg FROM=oracle/graalvm-ce:20.3.0-java8 .
22+
docker build -t $REGISTRY/nativeimage:graalvm-ce-20.3.0-java11 -f "$DOCKER_BUILDERS_DIR/Dockerfile-nativeimage" --build-arg FROM=oracle/graalvm-ce:20.3.0-java11 .
2323

2424
# RPM Build
25-
docker build -t $REGISTRY/rpmbuild:centos7 -f "$DOCKER_BUILDERS_DIR"/Dockerfile-rpmbuild --build-arg FROM=centos:7 .
26-
docker build -t $REGISTRY/rpmbuild:centos8 -f "$DOCKER_BUILDERS_DIR"/Dockerfile-rpmbuild --build-arg FROM=centos:8 .
27-
docker build -t $REGISTRY/rpmbuild:fedora32 -f "$DOCKER_BUILDERS_DIR"/Dockerfile-rpmbuild --build-arg FROM=fedora:32 .
28-
docker build -t $REGISTRY/rpmbuild:fedora33 -f "$DOCKER_BUILDERS_DIR"/Dockerfile-rpmbuild --build-arg FROM=fedora:33 .
29-
docker build -t $REGISTRY/rpmbuild:fedora34 -f "$DOCKER_BUILDERS_DIR"/Dockerfile-rpmbuild --build-arg FROM=fedora:34 .
25+
docker build -t $REGISTRY/rpmbuild:centos7 -f "$DOCKER_BUILDERS_DIR/Dockerfile-rpmbuild" --build-arg FROM=centos:7 .
26+
docker build -t $REGISTRY/rpmbuild:centos8 -f "$DOCKER_BUILDERS_DIR/Dockerfile-rpmbuild" --build-arg FROM=centos:8 .
27+
docker build -t $REGISTRY/rpmbuild:fedora32 -f "$DOCKER_BUILDERS_DIR/Dockerfile-rpmbuild" --build-arg FROM=fedora:32 .
28+
docker build -t $REGISTRY/rpmbuild:fedora33 -f "$DOCKER_BUILDERS_DIR/Dockerfile-rpmbuild" --build-arg FROM=fedora:33 .
29+
docker build -t $REGISTRY/rpmbuild:fedora34 -f "$DOCKER_BUILDERS_DIR/Dockerfile-rpmbuild" --build-arg FROM=fedora:34 .
3030

3131
# Login to Registry
3232
echo "${BINTRAY_API_KEY}" | docker login --username "${BINTRAY_USERNAME}" --password-stdin $REGISTRY

0 commit comments

Comments
 (0)