Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PMM-7 Update default RPM build vars #3245

Merged
merged 5 commits into from
Oct 17, 2024
Merged

PMM-7 Update default RPM build vars #3245

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7becf55
PMM-7 Update default RPM build vars
ademidoff Oct 16, 2024
c1b1fea
Merge branch 'main' into PMM-7-update-default-rpmbuild-vars
ademidoff Oct 16, 2024
cb608d2
PMM-7 remove Dockerfile(s) for RHEL7
ademidoff Oct 16, 2024
e33fdc6
PMM-7 remove submodules update
ademidoff Oct 16, 2024
2c7ffe3
PMM-7 revert the default docker image value
ademidoff Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 0 additions & 52 deletions build/docker/rpmbuild/Dockerfile
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions build/docker/server/Dockerfile
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions build/scripts/build-submodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
#!/bin/bash
set -o errexit

git submodule update --init --jobs 10
git submodule status

if [ -s ci.yml ]; then
if [ -f /home/ec2-user/venv/bin/activate ]; then
source /home/ec2-user/venv/bin/activate
Expand Down
4 changes: 2 additions & 2 deletions build/scripts/vars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ unset new_pmm_version
unset new_pmm_release
echo -e "\n\n\n>>> full_pmm_version=${full_pmm_version} pmm_version=${pmm_version} pmm_release=${pmm_release}\n\n\n"

rpmbuild_docker_image=${RPMBUILD_DOCKER_IMAGE:-public.ecr.aws/e7j3v3n0/rpmbuild:2}
rpmbuild_docker_image=${RPMBUILD_DOCKER_IMAGE:-public.ecr.aws/e7j3v3n0/rpmbuild:ol9}
rpms_dir=${root_dir}/tmp/pmm-server/RPMS
rpmbuild_dir=${root_dir}/sources/pmm/src/github.com/percona/pmm/build/packages/rpm/server
rpmbuild_dist=${RPMBUILD_DIST:-"el7"}
rpmbuild_dist=${RPMBUILD_DIST:-"el9"}
source_dir=${root_dir}/tmp/source/pmm2-client-${pmm_version}
binary_dir=${root_dir}/tmp/binary/pmm2-client-${pmm_version}
client_properties=${root_dir}/results/pmm-client.properties
Expand Down
Loading