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-13237 fix pmm2 ami and ovf pipelines #3072

Merged
merged 13 commits into from
Jul 19, 2024
Merged

PMM-13237 fix pmm2 ami and ovf pipelines #3072

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e0a27fe
PMM-13222 Fix pmm2-ami build.
talhabinrizwan Jul 12, 2024
a4c02bb
PMM-13222 Fix pmm2-ami build.
talhabinrizwan Jul 12, 2024
9044f3a
PMM-13222 Fix pmm2-ami build.
talhabinrizwan Jul 12, 2024
5e0ca24
PMM-13222 Fix pmm2-ami build.
talhabinrizwan Jul 12, 2024
b6d73de
PMM-13222 Fix pmm2-ami build.
talhabinrizwan Jul 13, 2024
3a5cea1
PMM-13222 Fix pmm2-ami build.
talhabinrizwan Jul 14, 2024
a29e00b
PMM-13222 Fix pmm2-ami build.
talhabinrizwan Jul 14, 2024
c2e4bec
PMM-13222 Fix pmm2-ami build.
talhabinrizwan Jul 15, 2024
269e607
PMM-13222 Fix pmm2-ami build.
talhabinrizwan Jul 15, 2024
07140da
Merge branch 'main' into PMM-13237-fix-pmm2-ami-and-ovf-pipelines
talhabinrizwan Jul 15, 2024
da3d6f7
Merge branch 'main' into PMM-13237-fix-pmm2-ami-and-ovf-pipelines
ademidoff Jul 15, 2024
e2bcdf7
PMM-13237 Fix pmm2-ami and ovf build.
talhabinrizwan Jul 18, 2024
15f9de3
Merge branch 'main' into PMM-13237-fix-pmm2-ami-and-ovf-pipelines
talhabinrizwan Jul 18, 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
12 changes: 6 additions & 6 deletions build/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pmm2-ovf-el9-rc: fetch-el9
sed -i 's|become_method: su|become_method: sudo|g' update/tasks/roles/postgres/tasks/main.yml && \
/usr/bin/packer build \
-var 'pmm_client_repos=pmm2-client testing' \
-var 'pmm_client_repo_name=percona-testing-x86_64' \
-var 'pmm_client_repo_name=pmm2-client-testing-x86_64' \
-var 'pmm2_server_repo=testing' \
-only virtualbox-ovf -color=false packer/pmm2.el9.json \
| tee build.log
Expand All @@ -49,7 +49,7 @@ pmm2-ovf-el9-dev-latest: fetch-el9
sed -i 's|become_method: su|become_method: sudo|g' update/tasks/roles/postgres/tasks/main.yml && \
/usr/bin/packer build \
-var 'pmm_client_repos=pmm2-client experimental' \
-var 'pmm_client_repo_name=percona-experimental-x86_64' \
-var 'pmm_client_repo_name=pmm2-client-experimental-x86_64' \
-var 'pmm2_server_repo=experimental' \
-only virtualbox-ovf -color=false packer/pmm2.el9.json \
| tee build.log
Expand All @@ -63,15 +63,15 @@ pmm2-azure:
pmm2-ami:
docker run --rm -v ${HOME}/.aws:/root/.aws -v `pwd`:/build -w /build hashicorp/packer:${PACKER_VERSION} \
build -var 'pmm_client_repos=pmm2-client experimental' \
-var 'pmm_client_repo_name=percona-experimental-x86_64' \
-var 'pmm_client_repo_name=pmm2-client-experimental-x86_64' \
-var 'pmm2_server_repo=experimental' \
-only amazon-ebs -color=false \
packer/pmm2.json

pmm2-ami-rc:
docker run --rm -v ${HOME}/.aws:/root/.aws -v `pwd`:/build -w /build hashicorp/packer:${PACKER_VERSION} \
build -var 'pmm_client_repos=pmm2-client testing' \
-var 'pmm_client_repo_name=percona-testing-x86_64' \
-var 'pmm_client_repo_name=pmm2-client-testing-x86_64' \
-var 'pmm2_server_repo=testing' \
-only amazon-ebs '-color=false' \
packer/pmm2.json
Expand All @@ -82,7 +82,7 @@ pmm2-ami-el9:
sed -i 's|become_method: su|become_method: sudo|g' update/tasks/roles/postgres/tasks/main.yml && \
docker run --rm -v ${HOME}/.aws:/root/.aws -v `pwd`:/build -w /build hashicorp/packer:${PACKER_VERSION} \
build -var 'pmm_client_repos=pmm2-client experimental' \
-var 'pmm_client_repo_name=percona-experimental-x86_64' \
-var 'pmm_client_repo_name=pmm2-client-experimental-x86_64' \
-var 'pmm2_server_repo=experimental' \
-only amazon-ebs -color=false \
packer/pmm2.el9.json
Expand All @@ -93,7 +93,7 @@ pmm2-ami-el9-rc:
sed -i 's|become_method: su|become_method: sudo|g' update/tasks/roles/postgres/tasks/main.yml && \
docker run --rm -v ${HOME}/.aws:/root/.aws -v `pwd`:/build -w /build hashicorp/packer:${PACKER_VERSION} \
build -var 'pmm_client_repos=pmm2-client testing' \
-var 'pmm_client_repo_name=percona-testing-x86_64' \
-var 'pmm_client_repo_name=pmm2-client-testing-x86_64' \
-var 'pmm2_server_repo=testing' \
-only amazon-ebs '-color=false' \
packer/pmm2.el9.json
Expand Down
10 changes: 10 additions & 0 deletions build/ansible/roles/lvm-init/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
---
- name: Remove device-mapper package without dependencies
command:
cmd: rpm -e --nodeps device-mapper
ademidoff marked this conversation as resolved.
Show resolved Hide resolved
ignore_errors: yes

- name: Remove device-mapper-libs package without dependencies
command:
cmd: rpm -e --nodeps device-mapper-libs
ignore_errors: yes

- name: Packages | Install OS tools
yum:
name:
Expand Down
2 changes: 1 addition & 1 deletion build/ansible/roles/pmm2-images/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ pmm2_server_repo: release
pmm_client_repos: "pmm2-client testing"

# line below is sed'ed by build-server-docker script
pmm_client_repo_name: "percona-testing-x86_64"
pmm_client_repo_name: "pmm2-client-testing-x86_64"
ademidoff marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions build/packer/pmm2.el9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
"delete_on_termination": true,
"device_name": "/dev/sda1",
"volume_size": 10,
"volume_type": "gp2"
"volume_type": "gp3"
BupycHuk marked this conversation as resolved.
Show resolved Hide resolved
},
{
"delete_on_termination": false,
"device_name": "/dev/sdb",
"volume_size": 100,
"volume_type": "gp2"
"volume_type": "gp3"
}
],
"region": "us-east-1",
Expand Down
13 changes: 8 additions & 5 deletions build/packer/pmm2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"single_disk": "false",
"pmm2_server_repo": "testing",
"pmm_client_repos": "pmm2-client testing",
"pmm_client_repo_name": "percona-testing-x86_64"
"pmm_client_repo_name": "pmm2-client-testing-x86_64"
},
"builders": [{
"type": "amazon-ebs",
Expand All @@ -13,18 +13,18 @@
"delete_on_termination": true,
"device_name": "/dev/sda1",
"volume_size": 8,
"volume_type": "gp2"
"volume_type": "gp3"
},
{
"delete_on_termination": false,
"device_name": "/dev/sdb",
"volume_size": 100,
"volume_type": "gp2"
"volume_type": "gp3"
}
],
"region": "us-east-1",
"security_group_id": "sg-688c2b1c",
"source_ami": "ami-00e87074e52e6c9f9",
"source_ami": "ami-0aedf6b1cb669b4c7",
"ssh_pty": "true",
"ena_support": "true",
"ssh_username": "centos",
Expand Down Expand Up @@ -106,8 +106,11 @@
"provisioners": [{
"type": "shell",
"inline": [
"sudo sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/fastestmirror.conf",
"sudo sed -i -e 's/^\\(mirrorlist\\)/#\\1/g' /etc/yum.repos.d/CentOS-Base.repo",
"sudo sed -i -e 's|^#baseurl.*|baseurl=http://vault.centos.org/centos/\\$releasever/os/\\$basearch/|g' /etc/yum.repos.d/CentOS-Base.repo",
"sudo yum -y update",
"sudo yum -y install epel-release",
"sudo yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm",
"sudo yum -y install ansible"
]
},
Expand Down
Loading