PMM-13086 setup improvements and fixes for BM (#53)

Percona-Lab · May 3, 2024 · 6af896d · 6af896d
1 parent 7b50f64
commit 6af896d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/pmm_psmdb-pbm_setup/docker-compose-rs.yaml b/pmm_psmdb-pbm_setup/docker-compose-rs.yaml
@@ -32,7 +32,7 @@ services:
       - ./conf/mongod-rs:/etc/mongod
       - ./conf/datagen:/etc/datagen:ro
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
-      - /tmp/backup_data:/tmp/backup_data
+      - /tmp/backup_data:/tmp/backup_data:rw
     privileged: true
     environment:
       PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
@@ -58,7 +58,7 @@ services:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs:/etc/mongod
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
-      - /tmp/backup_data:/tmp/backup_data
+      - /tmp/backup_data:/tmp/backup_data:rw
     privileged: true
     environment:
       PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
@@ -84,7 +84,7 @@ services:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs:/etc/mongod
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
-      - /tmp/backup_data:/tmp/backup_data
+      - /tmp/backup_data:/tmp/backup_data:rw
     privileged: true
     environment:
       PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
@@ -112,7 +112,7 @@ services:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs:/etc/mongod
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
-      - /tmp/backup_data:/tmp/backup_data
+      - /tmp/backup_data:/tmp/backup_data:rw
     privileged: true
     environment:
       PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
@@ -138,7 +138,7 @@ services:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs:/etc/mongod
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
-      - /tmp/backup_data:/tmp/backup_data
+      - /tmp/backup_data:/tmp/backup_data:rw
     privileged: true
     environment:
       PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
@@ -164,7 +164,7 @@ services:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs:/etc/mongod
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
-      - /tmp/backup_data:/tmp/backup_data
+      - /tmp/backup_data:/tmp/backup_data:rw
     privileged: true
     environment:
       PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017

diff --git a/pmm_qa/pdpgsql_pgsm_setup.yml b/pmm_qa/pdpgsql_pgsm_setup.yml
@@ -40,6 +40,7 @@
       - docker exec {{ pdpgsql_pgsm_container }} mkdir -p artifacts
       - docker cp ./pg_stat_monitor_setup.sh {{ pdpgsql_pgsm_container }}:/
       - docker cp ./pgsm_run_queries.sh {{ pdpgsql_pgsm_container }}:/
+      - docker cp ./pmm3-client-setup.sh {{ pdpgsql_pgsm_container }}:/
 
   - name: Execute Setup script inside the pdpgsql pdpgsql_pgsm_container
     shell: "{{ item }}"
@@ -49,7 +50,6 @@
   - name: Install pmm2-client on the pdpgsql_pgsm_container
     shell: "{{ item }}"
     with_items:
-      - docker exec {{ pdpgsql_pgsm_container }} wget https://raw.githubusercontent.com/Percona-Lab/qa-integration/{{ pmm_qa_branch }}/pmm_qa/pmm3-client-setup.sh
       - docker network connect pmm-qa {{ pdpgsql_pgsm_container }}
       - docker exec {{ pdpgsql_pgsm_container }} bash -x ./pmm3-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no
 

diff --git a/pmm_qa/pgsql_pgss_setup.yml b/pmm_qa/pgsql_pgss_setup.yml
@@ -38,6 +38,7 @@
       - docker exec {{ pgsql_pgss_container }} mkdir -p artifacts
       - docker cp ./pg_stat_statements_setup.sh {{ pgsql_pgss_container }}:/
       - docker cp ./pgsm_run_queries.sh {{ pgsql_pgss_container }}:/
+      - docker cp ./pmm3-client-setup.sh {{ pgsql_pgss_container }}:/
 
   - name: Execute Setup script inside the pgsql pgsql_pgss_container
     shell: "{{ item }}"
@@ -47,7 +48,6 @@
   - name: Install pmm2-client on the pgsql_pgss_container
     shell: "{{ item }}"
     with_items:
-      - docker exec {{ pgsql_pgss_container }} wget https://raw.githubusercontent.com/Percona-Lab/qa-integration/{{ pmm_qa_branch }}/pmm_qa/pmm3-client-setup.sh
       - docker network connect pmm-qa {{ pgsql_pgss_container }}
       - docker exec {{ pgsql_pgss_container }} bash -x ./pmm3-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no
 

diff --git a/pmm_qa/pmm-framework.py b/pmm_qa/pmm-framework.py
@@ -354,7 +354,7 @@ def execute_shell_scripts(shell_scripts, env_vars, args):
             if return_code == 0:
                 print(f"Shell script '{script}' executed successfully.")
             else:
-                print(f"Shell script '{script}' failed with return code: {return_code}!")
+                print(f"Shell script '{script}' failed with return code: {return_code}! \n {process.stderr}")
                 exit(return_code)
         except Exception as e:
             print("Unexpected error occurred:", e)

diff --git a/pmm_qa/ps_pmm_setup.yml b/pmm_qa/ps_pmm_setup.yml
@@ -39,6 +39,7 @@
     with_items:
       - docker exec {{ ps_container }} mkdir -p artifacts
       - docker cp ./client_container_ps_setup.sh {{ ps_container }}:/
+      - docker cp ./pmm3-client-setup.sh {{ ps_container }}:/
 
   - name: Get Product tarball URL based on the version
     shell: cat product_version_download_helper | grep -v pxc | grep ps | grep "\-{{ ps_version }}" | head -1 | awk -F'# ' '{print $3}'
@@ -60,7 +61,6 @@
   - name: Install pmm2-client on the ps_container
     shell: "{{ item }}"
     with_items:
-      - docker exec {{ ps_container }} wget https://raw.githubusercontent.com/Percona-Lab/qa-integration/{{ pmm_qa_branch }}/pmm_qa/pmm3-client-setup.sh
       - docker network connect pmm-qa {{ ps_container }}
       - docker exec {{ ps_container }} bash -x ./pmm3-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no
 

diff --git a/pmm_qa/pxc_proxysql_setup.yml b/pmm_qa/pxc_proxysql_setup.yml
@@ -41,6 +41,7 @@
       - docker exec {{ pxc_container }} mkdir -p artifacts
       - docker cp ./client_container_pxc_setup.sh {{ pxc_container }}:/
       - docker cp ./client_container_proxysql_setup.sh {{ pxc_container }}:/
+      - docker cp ./pmm3-client-setup.sh {{ pxc_container }}:/
 
   - name: Get PXC Product tarball URL based on the version
     shell: cat product_version_download_helper | grep pxc | grep "\-{{ pxc_version }}" | head -1 | awk -F'# ' '{print $3}'
@@ -78,7 +79,6 @@
   - name: Install pmm2-client on the pxc_container
     shell: "{{ item }}"
     with_items:
-      - docker exec {{ pxc_container }} wget https://raw.githubusercontent.com/Percona-Lab/qa-integration/{{ pmm_qa_branch }}/pmm_qa/pmm3-client-setup.sh
       - docker network connect pmm-qa {{ pxc_container }}
       - docker exec {{ pxc_container }} bash -x ./pmm3-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no
       - docker exec {{ pxc_container }} usermod -aG pmm-agent pxc