Skip to content

Commit

Permalink
PMM-7 Update default RPM build vars (#3245)
Browse files Browse the repository at this point in the history
* PMM-7 Update default RPM build vars

* PMM-7 remove Dockerfile(s) for RHEL7

* PMM-7 remove submodules update

* PMM-7 revert the default docker image value
  • Loading branch information
ademidoff authored Oct 17, 2024
1 parent 6712d56 commit 7cdb659
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 92 deletions.
52 changes: 0 additions & 52 deletions build/docker/rpmbuild/Dockerfile

This file was deleted.

36 changes: 0 additions & 36 deletions build/docker/server/Dockerfile

This file was deleted.

3 changes: 0 additions & 3 deletions build/scripts/build-submodules
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
2 changes: 1 addition & 1 deletion build/scripts/vars
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ echo -e "\n\n\n>>> full_pmm_version=${full_pmm_version} pmm_version=${pmm_versio
rpmbuild_docker_image=${RPMBUILD_DOCKER_IMAGE:-public.ecr.aws/e7j3v3n0/rpmbuild:2}
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

0 comments on commit 7cdb659

Please sign in to comment.