naming fixes

.github/workflows/prerelease.yml

@@ -70,7 +70,7 @@ jobs:
           set -x
           PRERELEASE_REVISION=$(scripts/get-prerelease-version.sh)
           echo "PRERELEASE_REVISION=${PRERELEASE_REVISION}" >> $GITHUB_ENV
-          echo "DOCKER_TAGS=nosqlbench/nosqlbench:${PRERELEASE_REVISION}-prerelease,nosqlbench/nosqlbench:prerelease" >> $GITHUB_ENV
+          echo "DOCKER_TAGS=nosqlbench/nosqlbench:${PRERELEASE_REVISION},nosqlbench/nosqlbench:prerelease" >> $GITHUB_ENV
 
       - name: build prerelease revision
         run: |
@@ -101,7 +101,7 @@ jobs:
 
       - name: sanity check docker image
         run: |
-          docker run --rm nosqlbench/nosqlbench:${{ env.PRERELEASE_REVISION }}-prerelease --version
+          docker run --rm nosqlbench/nosqlbench:${{ env.PRERELEASE_REVISION }} --version
 
 #      - name: bundle integration test logs
 #        run: |

RELEASENOTES.md

@@ -1,4 +1,5 @@
-- 1adb4e4af (HEAD -> prerelease-testing, origin/prerelease-testing) fix version, again
+- adb40cec4 (HEAD -> prerelease-testing) version fixes
+- 1adb4e4af (origin/prerelease-testing) fix version, again
 - 801ed23ce fix revision var
 - 430bee3eb fix version reference
 - 1f5b133f9 version fixes

scripts/package-prerelease.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+#
+# Copyright (c) 2023 nosqlbench
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -e
+set -x
+
+export REVISION=$(mvn help:evaluate -Dexpression=revision -q -DforceStdout)
+export PRERELEASE_REVISION=$(echo "${REVISION}" | cut -d'-' -f1)
+mvn package -Drevision="${PRERELEASE_REVISION}-pre"