Skip to content

Commit 0fc1b3c

Browse files
peterzhuamazonpeterzhuamazon
committed
Support PA without RCA and change email to release@opensearch.org
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
1 parent b759e84 commit 0fc1b3c

File tree

15 files changed

+26
-26
lines changed

15 files changed

+26
-26
lines changed

‎scripts/components/performance-analyzer/install.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ fi
6969
[ -z "$ARCHITECTURE" ] && ARCHITECTURE=`uname -m`
7070

7171
## Setup Performance Analyzer Agent
72-
mv $OUTPUT/plugins/opensearch-performance-analyzer/performance-analyzer-rca $OUTPUT/
72+
# mv $OUTPUT/plugins/opensearch-performance-analyzer/performance-analyzer-rca $OUTPUT/
7373

7474
## Performance Analyzer Configs
7575
if echo $ARTIFACTS | grep -Eo '/deb/|/rpm/'; then
7676
echo "DEB/RPM configs"
77-
echo 'true' > $OUTPUT/../var/lib/opensearch/rca_enabled.conf
77+
#echo 'true' > $OUTPUT/../var/lib/opensearch/rca_enabled.conf
7878
echo 'true' > $OUTPUT/../var/lib/opensearch/performance_analyzer_enabled.conf
7979
fi

‎scripts/pkg/build_templates/current/opensearch-dashboards/deb/debian/control

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Source: opensearch-dashboards
99
Section: web
1010
Priority: optional
11-
Maintainer: OpenSearch Team <opensearch@amazon.com>
11+
Maintainer: OpenSearch Team <release@opensearch.org>
1212
Build-Depends: debhelper-compat (= 12)
1313
Standards-Version: 4.5.0
1414
Homepage: https://opensearch.org/

‎scripts/pkg/build_templates/current/opensearch-dashboards/deb/debian/copyright

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
22
Upstream-Name: opensearch-dashboards
3-
Upstream-Contact: opensearch@amazon.com
3+
Upstream-Contact: release@opensearch.org
44
Source: https://opensearch.org
55
Files: *
66
Copyright: OpenSearch Contributors

‎scripts/pkg/build_templates/current/opensearch-dashboards/rpm/opensearch-dashboards.rpm.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,6 @@ exit 0
151151
%{product_dir}/logs
152152

153153
%changelog
154-
* Mon Mar 21 2022 OpenSearch Team <opensearch@amazon.com>
154+
* Mon Mar 21 2022 OpenSearch Team <release@opensearch.org>
155155
- Initial package
156156

‎scripts/pkg/build_templates/current/opensearch/deb/debian/control

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Source: opensearch
99
Section: web
1010
Priority: optional
11-
Maintainer: OpenSearch Team <opensearch@amazon.com>
11+
Maintainer: OpenSearch Team <release@opensearch.org>
1212
Build-Depends: debhelper-compat (= 12)
1313
Standards-Version: 4.5.0
1414
Homepage: https://opensearch.org/

‎scripts/pkg/build_templates/current/opensearch/deb/debian/copyright

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
22
Upstream-Name: opensearch
3-
Upstream-Contact: opensearch@amazon.com
3+
Upstream-Contact: release@opensearch.org
44
Source: https://opensearch.org
55
Files: *
66
Copyright: OpenSearch Contributors

‎scripts/pkg/build_templates/current/opensearch/rpm/opensearch.rpm.spec

+7-7
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ if [ -d %{buildroot}%{product_dir}/plugins/opensearch-security ]; then
6060
chmod 0755 %{buildroot}%{product_dir}/plugins/opensearch-security/tools/*
6161
fi
6262
# Pre-populate the folders to ensure rpm build success even without all plugins
63-
mkdir -p %{buildroot}%{product_dir}/performance-analyzer-rca
63+
#mkdir -p %{buildroot}%{product_dir}/performance-analyzer-rca
6464
#rm -rf %{buildroot}%{product_dir}/jdk
6565
# Symlinks (do not symlink config dir as security demo installer has dependency, if no presense it will switch to rpm/deb mode)
6666
ln -s %{data_dir} %{buildroot}%{product_dir}/data
6767
ln -s %{log_dir} %{buildroot}%{product_dir}/logs
6868
# Pre-populate PA configs if not present
69-
if [ ! -f %{buildroot}%{data_dir}/rca_enabled.conf ]; then
70-
echo 'true' > %{buildroot}%{data_dir}/rca_enabled.conf
71-
fi
69+
#if [ ! -f %{buildroot}%{data_dir}/rca_enabled.conf ]; then
70+
# echo 'true' > %{buildroot}%{data_dir}/rca_enabled.conf
71+
#fi
7272
if [ ! -f %{buildroot}%{data_dir}/performance_analyzer_enabled.conf ]; then
7373
echo 'true' > %{buildroot}%{data_dir}/performance_analyzer_enabled.conf
7474
fi
@@ -163,7 +163,7 @@ exit 0
163163
# Config dirs/files
164164
%dir %{config_dir}
165165
%config(noreplace) %{config_dir}/*
166-
%config(noreplace) %{data_dir}/rca_enabled.conf
166+
#%config(noreplace) %{data_dir}/rca_enabled.conf
167167
%config(noreplace) %{data_dir}/performance_analyzer_enabled.conf
168168

169169
# Service files
@@ -193,14 +193,14 @@ exit 0
193193
%{product_dir}/jdk
194194
%{product_dir}/lib
195195
%{product_dir}/modules
196-
%{product_dir}/performance-analyzer-rca
196+
#%{product_dir}/performance-analyzer-rca
197197
%{product_dir}/plugins
198198

199199
# Symlinks
200200
%{product_dir}/data
201201
%{product_dir}/logs
202202

203203
%changelog
204-
* Mon Mar 21 2022 OpenSearch Team <opensearch@amazon.com>
204+
* Mon Mar 21 2022 OpenSearch Team <release@opensearch.org>
205205
- Initial package
206206

‎scripts/pkg/build_templates/legacy/opensearch-dashboards/deb/debian/control

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Source: opensearch-dashboards
99
Section: web
1010
Priority: optional
11-
Maintainer: OpenSearch Team <opensearch@amazon.com>
11+
Maintainer: OpenSearch Team <release@opensearch.org>
1212
Build-Depends: debhelper-compat (= 12)
1313
Standards-Version: 4.5.0
1414
Homepage: https://opensearch.org/

‎scripts/pkg/build_templates/legacy/opensearch-dashboards/deb/debian/copyright

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
22
Upstream-Name: opensearch-dashboards
3-
Upstream-Contact: opensearch@amazon.com
3+
Upstream-Contact: release@opensearch.org
44
Source: https://opensearch.org
55
Files: *
66
Copyright: OpenSearch Contributors

‎scripts/pkg/build_templates/legacy/opensearch-dashboards/rpm/opensearch-dashboards.rpm.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,6 @@ exit 0
150150
%{product_dir}/logs
151151

152152
%changelog
153-
* Mon Mar 21 2022 OpenSearch Team <opensearch@amazon.com>
153+
* Mon Mar 21 2022 OpenSearch Team <release@opensearch.org>
154154
- Initial package
155155

‎scripts/pkg/build_templates/legacy/opensearch/deb/debian/control

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Source: opensearch
99
Section: web
1010
Priority: optional
11-
Maintainer: OpenSearch Team <opensearch@amazon.com>
11+
Maintainer: OpenSearch Team <release@opensearch.org>
1212
Build-Depends: debhelper-compat (= 12)
1313
Standards-Version: 4.5.0
1414
Homepage: https://opensearch.org/

‎scripts/pkg/build_templates/legacy/opensearch/deb/debian/copyright

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
22
Upstream-Name: opensearch
3-
Upstream-Contact: opensearch@amazon.com
3+
Upstream-Contact: release@opensearch.org
44
Source: https://opensearch.org
55
Files: *
66
Copyright: OpenSearch Contributors

‎scripts/pkg/build_templates/legacy/opensearch/rpm/opensearch.rpm.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,6 @@ exit 0
202202
%{product_dir}/logs
203203

204204
%changelog
205-
* Mon Mar 21 2022 OpenSearch Team <opensearch@amazon.com>
205+
* Mon Mar 21 2022 OpenSearch Team <release@opensearch.org>
206206
- Initial package
207207

‎src/assemble_workflow/bundle_linux_deb.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def __init__(self, filename: str, package_path: str, min_path: str) -> None:
2525
def changelog_content(self, version: str) -> List[str]:
2626
# In the changelog content we are dynamically generate this part for now.
2727
# Instead of 'UNRELEASED' its possible to use 'stable'
28-
# which will use gpg to sign with the given from 'OpenSearch Team <opensearch@amazon.com>'
28+
# which will use gpg to sign with the given from 'OpenSearch Team <release@opensearch.org>'
2929
# Debian official documentation suggest using 'unstable' to replace 'UNRELEASED'
3030
# but it is still asking a key to sign during build, therefore use 'UNRELEASED' here
3131
# as part of changelog content only
@@ -36,7 +36,7 @@ def changelog_content(self, version: str) -> List[str]:
3636
"",
3737
" * Initial release.",
3838
"",
39-
" -- OpenSearch Team <opensearch@amazon.com> Fri, 14 Oct 2022 10:06:23 +0000"
39+
" -- OpenSearch Team <release@opensearch.org> Fri, 14 Oct 2022 10:06:23 +0000"
4040
]
4141

4242
def generate_changelog_file(self, dest: str, version: str) -> None:
@@ -113,7 +113,7 @@ def build(self, name: str, dest: str, archive_path: str, build_cls: BuildManifes
113113
[
114114
'debmake',
115115
'--fullname "OpenSearch Team"',
116-
'--email "opensearch@amazon.com"',
116+
'--email "release@opensearch.org"',
117117
'--invoke debuild',
118118
f'--package {self.filename}',
119119
'--native',

‎tests/tests_assemble_workflow/test_bundle_linux_deb.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def test_build_deb(self, generate_changelog_file_call_mock: Mock, check_call_moc
5656

5757
self.assertRaises(KeyError, lambda: os.environ['OPENSEARCH_PATH_CONF'])
5858
self.assertEqual(check_call_mock.call_count, 1)
59-
self.assertEqual('debmake --fullname "OpenSearch Team" --email "opensearch@amazon.com" --invoke debuild --package opensearch --native --revision 1 --upstreamversion 1.3.0',
59+
self.assertEqual('debmake --fullname "OpenSearch Team" --email "release@opensearch.org" --invoke debuild --package opensearch --native --revision 1 --upstreamversion 1.3.0',
6060
args_list_deb[0][0][0])
6161
self.assertEqual(shutil_move_mock.call_count, 2)
6262
self.assertEqual(generate_changelog_file_call_mock.call_count, 1)
@@ -74,7 +74,7 @@ def test_build_deb_qualifier(self, generate_changelog_file_call_mock: Mock, chec
7474

7575
self.assertRaises(KeyError, lambda: os.environ['OPENSEARCH_PATH_CONF'])
7676
self.assertEqual(check_call_mock.call_count, 1)
77-
self.assertEqual('debmake --fullname "OpenSearch Team" --email "opensearch@amazon.com" --invoke debuild --package opensearch --native --revision 1 --upstreamversion 2.0.0.alpha1',
77+
self.assertEqual('debmake --fullname "OpenSearch Team" --email "release@opensearch.org" --invoke debuild --package opensearch --native --revision 1 --upstreamversion 2.0.0.alpha1',
7878
args_list_deb_qualifier[0][0][0])
7979
self.assertEqual(shutil_move_mock.call_count, 2)
8080
self.assertEqual(generate_changelog_file_call_mock.call_count, 1)
@@ -94,6 +94,6 @@ def test_generate_changelog_file(self, file_mock: Mock) -> None:
9494
call('\n'),
9595
call(' * Initial release.\n'),
9696
call('\n'),
97-
call(' -- OpenSearch Team <opensearch@amazon.com> Fri, 14 Oct 2022 10:06:23 +0000\n')
97+
call(' -- OpenSearch Team <release@opensearch.org> Fri, 14 Oct 2022 10:06:23 +0000\n')
9898
]
9999
)

0 commit comments

Comments
 (0)