Skip to content

Commit 12079c4

Browse files
vorselvorsel
committed
PSMDB-1945 mongot: change package naming
1 parent 4a1ff1a commit 12079c4

7 files changed

Lines changed: 43 additions & 43 deletions

File tree

‎percona-packaging/conf/mongot-wrapper.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
# Percona MongoDB Search (mongot) launcher.
3-
# The actual bundle (launcher + bundled JDK + jars) lives in /usr/lib/percona-server-mongodb-mongot.
3+
# The actual bundle (launcher + bundled JDK + jars) lives in /usr/lib/percona-search-mongodb.
44
# This wrapper exists because the upstream `mongot` script resolves siblings via
55
# ${BASH_SOURCE[0]} and therefore must be invoked from its real directory.
6-
exec /usr/lib/percona-server-mongodb-mongot/mongot "$@"
6+
exec /usr/lib/percona-search-mongodb/mongot "$@"

‎percona-packaging/debian/changelog‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
percona-server-mongodb-mongot (0.50.0-1) unstable; urgency=medium
1+
percona-search-mongodb (0.50.0-1) unstable; urgency=medium
22

33
* Initial Percona packaging of MongoDB Search (mongot).
44

‎percona-packaging/debian/control‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
Source: percona-server-mongodb-mongot
1+
Source: percona-search-mongodb
22
Section: database
33
Priority: optional
44
Maintainer: Percona LLC <info@percona.com>
55
Build-Depends: debhelper (>= 9), lsb-release
66
Standards-Version: 4.5.0
77
Homepage: https://github.com/percona/percona-mongot
88

9-
Package: percona-server-mongodb-mongot
9+
Package: percona-search-mongodb
1010
Architecture: amd64 arm64
1111
Depends: ${misc:Depends}, adduser
1212
Description: Percona Search for MongoDB (mongot).

‎percona-packaging/debian/install‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
usr/lib/percona-server-mongodb-mongot/* /usr/lib/percona-server-mongodb-mongot/
1+
usr/lib/percona-search-mongodb/* /usr/lib/percona-search-mongodb/
22
usr/bin/mongot /usr/bin/
33
etc/mongot/mongot.yml /etc/mongot/
44
etc/default/mongot /etc/default/

‎percona-packaging/debian/rules‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/usr/bin/make -f
2-
# debian/rules for percona-server-mongodb-mongot.
2+
# debian/rules for percona-search-mongodb.
33
# The mongot bundle is built externally with Bazel and shipped to debian/rules
4-
# as `prebuilt/percona-server-mongodb-mongot-bundle.tar.gz`. Here we just lay it out.
4+
# as `prebuilt/percona-search-mongodb-bundle.tar.gz`. Here we just lay it out.
55

66
export DH_VERBOSE=1
77
TMP=$(CURDIR)/debian/tmp
8-
BUNDLE=$(CURDIR)/prebuilt/percona-server-mongodb-mongot-bundle.tar.gz
8+
BUNDLE=$(CURDIR)/prebuilt/percona-search-mongodb-bundle.tar.gz
99

1010
%:
1111
dh $@ --with=systemd
@@ -28,15 +28,15 @@ override_dh_strip_nondeterminism:
2828

2929
override_dh_auto_install:
3030
@echo "RULES.$@"
31-
mkdir -p $(TMP)/usr/lib/percona-server-mongodb-mongot
31+
mkdir -p $(TMP)/usr/lib/percona-search-mongodb
3232
mkdir -p $(TMP)/usr/bin
3333
mkdir -p $(TMP)/etc/mongot
3434
mkdir -p $(TMP)/etc/default
3535
mkdir -p $(TMP)/etc/logrotate.d
3636
mkdir -p $(TMP)/lib/systemd/system
3737
mkdir -p $(TMP)/var/lib/mongot
3838
mkdir -p $(TMP)/var/log/mongot
39-
tar -xzf $(BUNDLE) -C $(TMP)/usr/lib/percona-server-mongodb-mongot --strip-components=1
39+
tar -xzf $(BUNDLE) -C $(TMP)/usr/lib/percona-search-mongodb --strip-components=1
4040
install -m 0755 percona-packaging/conf/mongot-wrapper.sh $(TMP)/usr/bin/mongot
4141
install -m 0640 percona-packaging/conf/mongot.yml $(TMP)/etc/mongot/mongot.yml
4242
install -m 0640 percona-packaging/conf/mongot.env $(TMP)/etc/default/mongot

percona-packaging/rpm/percona-server-mongodb-mongot.spec renamed to percona-packaging/rpm/percona-search-mongodb.spec

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
%{?el10: %global systemd 1}
1111
%{?amzn2023: %global systemd 1}
1212

13-
Name: percona-server-mongodb-mongot
13+
Name: percona-search-mongodb
1414
Version: @@VERSION@@
1515
Release: @@RELEASE@@%{?dist}
1616
Summary: Percona Search for MongoDB (mongot)
1717

1818
Group: Applications/Databases
1919
License: SSPL-1.0
2020
URL: https://github.com/percona/percona-mongot
21-
Source0: percona-server-mongodb-mongot-%{version}.tar.gz
22-
Source1: percona-server-mongodb-mongot-bundle.tar.gz
21+
Source0: percona-search-mongodb-%{version}.tar.gz
22+
Source1: percona-search-mongodb-bundle.tar.gz
2323

2424
# The bundle ships a prebuilt JDK and native .so libraries; skip auto-discovery.
2525
AutoReqProv: no
@@ -43,15 +43,15 @@ capabilities for MongoDB and is intended to run alongside Percona Server
4343
for MongoDB to serve search queries and manage search indexes.
4444

4545
%prep
46-
%setup -q -n percona-server-mongodb-mongot-%{version}
46+
%setup -q -n percona-search-mongodb-%{version}
4747

4848
%build
4949
# The mongot bundle is built externally with Bazel (see mongot_builder.sh).
5050
# Nothing to compile here. Install just puts the prebuilt tarball into place.
5151

5252
%install
5353
rm -rf $RPM_BUILD_ROOT
54-
install -m 0755 -d $RPM_BUILD_ROOT/usr/lib/percona-server-mongodb-mongot
54+
install -m 0755 -d $RPM_BUILD_ROOT/usr/lib/percona-search-mongodb
5555
install -m 0755 -d $RPM_BUILD_ROOT%{_bindir}
5656
install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/mongot
5757
install -m 0750 -d $RPM_BUILD_ROOT%{_sysconfdir}/mongot/secrets
@@ -61,7 +61,7 @@ install -m 0750 -d $RPM_BUILD_ROOT%{_sharedstatedir}/mongot
6161
install -m 0750 -d $RPM_BUILD_ROOT%{_localstatedir}/log/mongot
6262

6363
# Lay out the prebuilt bundle.
64-
tar -xzf %{SOURCE1} -C $RPM_BUILD_ROOT/usr/lib/percona-server-mongodb-mongot --strip-components=1
64+
tar -xzf %{SOURCE1} -C $RPM_BUILD_ROOT/usr/lib/percona-search-mongodb --strip-components=1
6565

6666
# Thin launcher on PATH.
6767
install -m 0755 percona-packaging/conf/mongot-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/mongot
@@ -112,7 +112,7 @@ chmod 0750 %{_sysconfdir}/mongot
112112

113113
%files
114114
%defattr(-,root,root,-)
115-
/usr/lib/percona-server-mongodb-mongot
115+
/usr/lib/percona-search-mongodb
116116
%{_bindir}/mongot
117117
%dir %attr(0750, root, mongod) %{_sysconfdir}/mongot
118118
%dir %attr(0750, root, mongod) %{_sysconfdir}/mongot/secrets

‎percona-packaging/scripts/mongot_builder.sh‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Usage: $0 [OPTIONS]
2323
--ps4m_release Package release/revision number (rpm Release / deb revision; same for both)
2424
2525
--help) usage ;;
26-
Example $0 --builddir=/tmp/percona-server-mongodb-mongot --get_sources=1 --build_mongot=1 --build_variant=linux-x64
26+
Example $0 --builddir=/tmp/percona-search-mongodb --get_sources=1 --build_mongot=1 --build_variant=linux-x64
2727
EOF
2828
exit 1
2929
}
@@ -89,12 +89,12 @@ get_sources(){
8989
echo "Sources will not be downloaded"
9090
return 0
9191
fi
92-
PRODUCT=percona-server-mongodb-mongot
93-
echo "PRODUCT=${PRODUCT}" > percona-server-mongodb-mongot.properties
94-
echo "BUILD_NUMBER=${BUILD_NUMBER}" >> percona-server-mongodb-mongot.properties
95-
echo "BUILD_ID=${BUILD_ID}" >> percona-server-mongodb-mongot.properties
96-
echo "VERSION=${VERSION}" >> percona-server-mongodb-mongot.properties
97-
echo "BRANCH=${BRANCH}" >> percona-server-mongodb-mongot.properties
92+
PRODUCT=percona-search-mongodb
93+
echo "PRODUCT=${PRODUCT}" > percona-search-mongodb.properties
94+
echo "BUILD_NUMBER=${BUILD_NUMBER}" >> percona-search-mongodb.properties
95+
echo "BUILD_ID=${BUILD_ID}" >> percona-search-mongodb.properties
96+
echo "VERSION=${VERSION}" >> percona-search-mongodb.properties
97+
echo "BRANCH=${BRANCH}" >> percona-search-mongodb.properties
9898
rm -rf ${PRODUCT}
9999
git clone "$REPO" ${PRODUCT}
100100
retval=$?
@@ -117,7 +117,7 @@ get_sources(){
117117
echo "export REVISION=${REVISION}" >> VERSION
118118
echo "export GITCOMMIT=${GITCOMMIT}" >> VERSION
119119
echo "export GITBRANCH=${GITBRANCH}" >> VERSION
120-
echo "export REVISION=${REVISION}" >> ${WORKDIR}/percona-server-mongodb-mongot.properties
120+
echo "export REVISION=${REVISION}" >> ${WORKDIR}/percona-search-mongodb.properties
121121
cd ${WORKDIR}
122122
rm -fr debian rpm ${PRODUCT}-${VERSION}
123123

@@ -135,7 +135,7 @@ get_sources(){
135135
exit 1
136136
fi
137137
tar --owner=0 --group=0 --exclude=.git -czf ${PRODUCT}-${VERSION}.tar.gz ${PRODUCT}-${VERSION}
138-
echo "UPLOAD=UPLOAD/experimental/BUILDS/${PRODUCT}/${PRODUCT}-${VERSION}/${BRANCH}/${REVISION}/${BUILD_ID}" >> percona-server-mongodb-mongot.properties
138+
echo "UPLOAD=UPLOAD/experimental/BUILDS/${PRODUCT}/${PRODUCT}-${VERSION}/${BRANCH}/${REVISION}/${BUILD_ID}" >> percona-search-mongodb.properties
139139
mkdir -p $WORKDIR/source_tarball
140140
mkdir -p $CURDIR/source_tarball
141141
cp ${PRODUCT}-${VERSION}.tar.gz $WORKDIR/source_tarball
@@ -233,10 +233,10 @@ install_deps() {
233233

234234
get_tar(){
235235
TARBALL=$1
236-
TARFILE=$(basename $(find $WORKDIR/$TARBALL -name 'percona-server-mongodb-mongot*.tar.gz' | sort | tail -n1))
236+
TARFILE=$(basename $(find $WORKDIR/$TARBALL -name 'percona-search-mongodb*.tar.gz' | sort | tail -n1))
237237
if [ -z $TARFILE ]
238238
then
239-
TARFILE=$(basename $(find $CURDIR/$TARBALL -name 'percona-server-mongodb-mongot*.tar.gz' | sort | tail -n1))
239+
TARFILE=$(basename $(find $CURDIR/$TARBALL -name 'percona-search-mongodb*.tar.gz' | sort | tail -n1))
240240
if [ -z $TARFILE ]
241241
then
242242
echo "There is no $TARBALL for build"
@@ -282,7 +282,7 @@ build_mongot(){
282282
get_tar "source_tarball"
283283
cd $WORKDIR
284284
rm -rf ${PRODUCT}-${VERSION}
285-
TARFILE=$(basename $(find . -maxdepth 1 -name 'percona-server-mongodb-mongot*.tar.gz' ! -name '*-bundle.tar.gz' | sort | tail -n1))
285+
TARFILE=$(basename $(find . -maxdepth 1 -name 'percona-search-mongodb*.tar.gz' ! -name '*-bundle.tar.gz' | sort | tail -n1))
286286
tar xzf ${TARFILE}
287287
cd ${PRODUCT}-${VERSION}
288288
source VERSION
@@ -353,7 +353,7 @@ get_bundle(){
353353
BUNDLE_PLATFORM=$(host_bazel_platform)
354354
BUNDLE_SRC=$(find "${WORKDIR}/tarball" "${CURDIR}/tarball" -maxdepth 1 -name "${PRODUCT}-*-${BUNDLE_PLATFORM}.tar.gz" 2>/dev/null | sort | tail -n1)
355355
if [ -n "${BUNDLE_SRC}" ] && [ -f "${BUNDLE_SRC}" ]; then
356-
cp "${BUNDLE_SRC}" "${WORKDIR}/percona-server-mongodb-mongot-bundle.tar.gz"
356+
cp "${BUNDLE_SRC}" "${WORKDIR}/percona-search-mongodb-bundle.tar.gz"
357357
else
358358
echo "No mongot bundle for ${BUNDLE_PLATFORM} found in tarball/."
359359
echo "Run --build_mongot=1 --build_variant=$(echo ${BUNDLE_PLATFORM} | sed 's/linux_x86_64/linux-x64/;s/linux_aarch64/linux-aarch64/') on a matching-arch host first."
@@ -375,7 +375,7 @@ build_rpm(){
375375
get_bundle
376376
rm -fr rpmbuild
377377
mkdir -vp rpmbuild/{SOURCES,SPECS,BUILD,SRPMS,RPMS}
378-
TARFILE=$(basename $(find . -maxdepth 1 -name 'percona-server-mongodb-mongot*.tar.gz' ! -name '*-bundle.tar.gz' | sort | tail -n1))
378+
TARFILE=$(basename $(find . -maxdepth 1 -name 'percona-search-mongodb*.tar.gz' ! -name '*-bundle.tar.gz' | sort | tail -n1))
379379
if ! tar -xzf ${TARFILE} --wildcards "*/percona-packaging" --strip=1; then
380380
echo "ERROR: source tarball does not contain percona-packaging/."
381381
exit 1
@@ -384,18 +384,18 @@ build_rpm(){
384384
source VERSION
385385
sed -e "s:@@VERSION@@:${VERSION}:g" \
386386
-e "s:@@RELEASE@@:${RELEASE}:g" \
387-
percona-packaging/rpm/percona-server-mongodb-mongot.spec > rpmbuild/SPECS/percona-server-mongodb-mongot.spec
387+
percona-packaging/rpm/percona-search-mongodb.spec > rpmbuild/SPECS/percona-search-mongodb.spec
388388
cp ${TARFILE} rpmbuild/SOURCES/
389-
cp percona-server-mongodb-mongot-bundle.tar.gz rpmbuild/SOURCES/
389+
cp percona-search-mongodb-bundle.tar.gz rpmbuild/SOURCES/
390390

391-
echo "RHEL=${RHEL}" >> ${WORKDIR}/percona-server-mongodb-mongot.properties
392-
echo "ARCH=${ARCH}" >> ${WORKDIR}/percona-server-mongodb-mongot.properties
391+
echo "RHEL=${RHEL}" >> ${WORKDIR}/percona-search-mongodb.properties
392+
echo "ARCH=${ARCH}" >> ${WORKDIR}/percona-search-mongodb.properties
393393

394394
rpmbuild -bb \
395395
--define "_topdir ${WORKDIR}/rpmbuild" \
396396
--define "dist .${OS_NAME}" \
397397
--define "version ${VERSION}" \
398-
rpmbuild/SPECS/percona-server-mongodb-mongot.spec
398+
rpmbuild/SPECS/percona-search-mongodb.spec
399399
return_code=$?
400400
if [ $return_code != 0 ]; then
401401
exit $return_code
@@ -418,7 +418,7 @@ build_deb(){
418418
get_tar "source_tarball"
419419
get_bundle
420420
rm -rf ${PRODUCT}-${VERSION}
421-
TARFILE=$(basename $(find . -maxdepth 1 -name 'percona-server-mongodb-mongot*.tar.gz' ! -name '*-bundle.tar.gz' | sort | tail -n1))
421+
TARFILE=$(basename $(find . -maxdepth 1 -name 'percona-search-mongodb*.tar.gz' ! -name '*-bundle.tar.gz' | sort | tail -n1))
422422
tar -xzf ${TARFILE}
423423
cd ${PRODUCT}-${VERSION}
424424
source VERSION
@@ -428,12 +428,12 @@ build_deb(){
428428
rm -rf debian
429429
cp -r percona-packaging/debian ./debian
430430
mkdir -p prebuilt
431-
cp ${WORKDIR}/percona-server-mongodb-mongot-bundle.tar.gz prebuilt/percona-server-mongodb-mongot-bundle.tar.gz
431+
cp ${WORKDIR}/percona-search-mongodb-bundle.tar.gz prebuilt/percona-search-mongodb-bundle.tar.gz
432432

433433
export DEBIAN=$(lsb_release -sc)
434434
export ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)
435-
echo "DEBIAN=${DEBIAN}" >> ${WORKDIR}/percona-server-mongodb-mongot.properties
436-
echo "ARCH=${ARCH}" >> ${WORKDIR}/percona-server-mongodb-mongot.properties
435+
echo "DEBIAN=${DEBIAN}" >> ${WORKDIR}/percona-search-mongodb.properties
436+
echo "ARCH=${ARCH}" >> ${WORKDIR}/percona-search-mongodb.properties
437437

438438
dch -m -D "${DEBIAN}" --force-distribution -v "${VERSION}-${RELEASE}.${DEBIAN}" 'Build for distribution'
439439
dpkg-buildpackage -rfakeroot -us -uc -b
@@ -447,7 +447,7 @@ build_deb(){
447447
#main
448448

449449
CURDIR=$(pwd)
450-
VERSION_FILE=$CURDIR/percona-server-mongodb-mongot.properties
450+
VERSION_FILE=$CURDIR/percona-search-mongodb.properties
451451
args=
452452
WORKDIR=
453453
SRPM=0
@@ -466,7 +466,7 @@ RELEASE="1"
466466
REVISION=0
467467
BRANCH="main"
468468
REPO="https://github.com/vorsel/percona-mongot.git"
469-
PRODUCT=percona-server-mongodb-mongot
469+
PRODUCT=percona-search-mongodb
470470
VARIANT="linux-x64"
471471
parse_arguments PICK-ARGS-FROM-ARGV "$@"
472472
PSM_BRANCH=${BRANCH}

0 commit comments

Comments
 (0)