Merge pull request #636 from Percona-QA/PMM-7-minor-polish

PMM-7 minor doc, jobs order and job name refactoring
Percona-QA · Feb 9, 2024 · aa00be6 · aa00be6
2 parents bd7e9a8 + 7cd9bb0
commit aa00be6
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 76 deletions.
diff --git a/.github/workflows/pmm-package-test-fb.yml b/.github/workflows/pmm-package-test-fb.yml
@@ -61,9 +61,11 @@ on:
         type: string
       metrics_mode:
         description: 'Select the Metrics Mode for PMM Client:'
-        required: true
         default: 'auto'
         type: string
+      test_name:
+        description: 'Name of the test to pretty display in checks list'
+        type: string
 
 jobs:
   get_versions:
@@ -89,5 +91,5 @@ jobs:
       repository: 'dev-latest'
       metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
       playbook: ${{ inputs.playbook || 'pmm2-client_integration_custom_path' }}
-      test_name: ${{ matrix.os }}
+      test_name: ${{ inputs.test_name > '' && format('{0} {1}', inputs.test_name, matrix.os) || matrix.os }}
       os: ${{ matrix.os }}
diff --git a/.github/workflows/pmm-package-test-matrix-full.yml b/.github/workflows/pmm-package-test-matrix-full.yml
@@ -39,25 +39,15 @@ jobs:
       metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
       playbook: "pmm2-client_integration"
 
-  cu_test:
-    name: "Package Upgrade (basic)"
-    uses: ./.github/workflows/pmm-package-test-single.yml
-    secrets: inherit
-    with:
-      package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
-      repository: ${{ inputs.repository || 'dev-latest' }}
-      metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
-      playbook: "pmm2-client_upgrade"
-
-  tb_test:
-    name: "Tarball Install (basic)"
+  i_test:
+    name: "Package Install"
     uses: ./.github/workflows/pmm-package-test-single.yml
     secrets: inherit
     with:
       package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
       repository: ${{ inputs.repository || 'dev-latest' }}
       metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
-      playbook: "pmm2-client_custom_path"
+      playbook: "pmm2-client_integration"
 
   auth_config_test:
     name: "Package Install (auth config)"
@@ -79,25 +69,25 @@ jobs:
       metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
       playbook: "pmm2-client_integration_auth_register"
 
-  tbi_test:
-    name: "Tarball Install (custom path)"
+  cu_test:
+    name: "Package Upgrade (basic)"
     uses: ./.github/workflows/pmm-package-test-single.yml
     secrets: inherit
     with:
       package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
       repository: ${{ inputs.repository || 'dev-latest' }}
       metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
-      playbook: "pmm2-client_integration_custom_path"
+      playbook: "pmm2-client_upgrade"
 
-  port_test:
-    name: "Tarball Install (custom port)"
+  iu_test:
+    name: "Package Upgrade"
     uses: ./.github/workflows/pmm-package-test-single.yml
     secrets: inherit
     with:
       package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
       repository: ${{ inputs.repository || 'dev-latest' }}
       metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
-      playbook: "pmm2-client_integration_custom_port"
+      playbook: "pmm2-client_integration_upgrade"
 
   port_u_test:
     name: "Package Upgrade: custom port"
@@ -109,25 +99,35 @@ jobs:
       metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
       playbook: "pmm2-client_integration_upgrade_custom_port"
 
-  i_test:
-    name: "Package Install"
+  tb_test:
+    name: "Tarball Install (basic)"
     uses: ./.github/workflows/pmm-package-test-single.yml
     secrets: inherit
     with:
       package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
       repository: ${{ inputs.repository || 'dev-latest' }}
       metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
-      playbook: "pmm2-client_integration"
+      playbook: "pmm2-client_custom_path"
 
-  iu_test:
-    name: "Package Upgrade"
+  tbi_test:
+    name: "Tarball Install (custom path)"
     uses: ./.github/workflows/pmm-package-test-single.yml
     secrets: inherit
     with:
       package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
       repository: ${{ inputs.repository || 'dev-latest' }}
       metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
-      playbook: "pmm2-client_integration_upgrade"
+      playbook: "pmm2-client_integration_custom_path"
+
+  port_test:
+    name: "Tarball Install (custom port)"
+    uses: ./.github/workflows/pmm-package-test-single.yml
+    secrets: inherit
+    with:
+      package_testing_branch: ${{ inputs.package_testing_branch || 'master' }}
+      repository: ${{ inputs.repository || 'dev-latest' }}
+      metrics_mode: ${{ inputs.metrics_mode || 'auto' }}
+      playbook: "pmm2-client_integration_custom_port"
 
   tu_test:
     name: "Tarball Upgrade (custom path)"

diff --git a/Vagrantfile.template.pmm2-deb b/Vagrantfile.template.pmm2-deb
@@ -20,7 +20,7 @@ Vagrant.configure(2) do |config|
   config.vm.synced_folder "/media/sf_work/PMM/package-testing/", "/pmm/package-testing/"
   config.vm.provision "shell", privileged: true, inline: <<-SHELL
     ## Set environment variables...
-    export PMM_SERVER_IP=192.168.1.43:443
+    export PMM_SERVER_IP=10.0.2.2:443
     export METRICS_MODE=auto
     export PMM_VERSION="2.33.0"
     export install_repo=main
@@ -32,25 +32,22 @@ Vagrant.configure(2) do |config|
     sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367
     sudo apt update -y
     sudo apt-get install -y ansible git wget
-    cd /pmm/package-testing
+    cd /pmm/package-testing/playbooks
 
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_upgrade.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_custom_path.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_upgrade.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_custom_path.yml
 
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_auth_config.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_auth_register.yml
-    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_auth_setup.yml
-
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_custom_path.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_custom_port.yml
-
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_upgrade_custom_port.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_auth_config.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_auth_register.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_custom_path.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_custom_port.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_upgrade_custom_port.yml
 
 ######### Matrix tests
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_upgrade.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_upgrade_custom_path.yml
+    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_upgrade.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_upgrade_custom_path.yml
 #########
       SHELL
 end
diff --git a/Vagrantfile.template.pmm2-rpm b/Vagrantfile.template.pmm2-rpm
@@ -4,7 +4,6 @@
 Vagrant.require_version ">= 1.7.0"
 
 Vagrant.configure(2) do |config|
-
   ### Due to subscription issues oracle linux is used instead rhel for local package test run
 #  config.vm.box = "generic/oracle7"
 #  config.vm.box = "generic/oracle8"
@@ -23,7 +22,7 @@ Vagrant.configure(2) do |config|
   config.vm.synced_folder "/media/sf_work/PMM/package-testing/", "/pmm/package-testing/"
   config.vm.provision "shell", privileged: true, inline: <<-SHELL
     ## Set environment variables...
-    export PMM_SERVER_IP=192.168.1.43:443
+    export PMM_SERVER_IP=10.0.2.2:443
     export METRICS_MODE=auto
     export PMM_VERSION="2.33.0"
     export install_repo=main
@@ -35,24 +34,22 @@ Vagrant.configure(2) do |config|
     sudo yum install -y ansible-core git wget
     ### for Centos 7
     # sudo yum install -y ansible git wget
-    cd /pmm/package-testing
-
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_upgrade.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_custom_path.yml
+    cd /pmm/package-testing/playbooks
 
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_auth_config.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_auth_register.yml
-    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_auth_setup.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_upgrade.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_custom_path.yml
 
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_custom_path.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_custom_port.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_upgrade_custom_port.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_auth_config.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_auth_register.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_custom_path.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_custom_port.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_upgrade_custom_port.yml
 
 ######### Matrix tests
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_upgrade.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_upgrade_custom_path.yml
+    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_upgrade.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_upgrade_custom_path.yml
 #########
       SHELL
 end
diff --git a/Vagrantfile.template.pmm2-ub b/Vagrantfile.template.pmm2-ub
@@ -6,7 +6,7 @@ Vagrant.require_version ">= 1.7.0"
 Vagrant.configure(2) do |config|
 
 #  config.vm.box = "generic/ubuntu1804"
-  config.vm.box = "ubuntu/focal64"
+  config.vm.box = "generic/ubuntu2004"
 #  config.vm.box = "generic/ubuntu2204"
 
   # Disable the new default behavior introduced in Vagrant 1.7, to
@@ -22,7 +22,7 @@ Vagrant.configure(2) do |config|
   config.vm.synced_folder "/media/sf_work/PMM/package-testing/", "/pmm/package-testing/"
   config.vm.provision "shell", privileged: true, inline: <<-SHELL
     ## Set environment variables...
-    export PMM_SERVER_IP=192.168.1.43:443
+    export PMM_SERVER_IP=10.0.2.2:443
     export METRICS_MODE=auto
     export PMM_VERSION="2.33.0"
     export install_repo=main
@@ -33,25 +33,22 @@ Vagrant.configure(2) do |config|
     sudo apt-get install -y software-properties-common
     sudo apt-add-repository --yes --update ppa:ansible/ansible
     sudo apt-get install -y ansible git wget
-    cd /pmm/package-testing
+    cd /pmm/package-testing/playbooks
 
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_upgrade.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_custom_path.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_upgrade.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_custom_path.yml
 
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_auth_config.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_auth_register.yml
-    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_auth_setup.yml
-
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_custom_path.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_custom_port.yml
-
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_upgrade_custom_port.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_auth_config.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_auth_register.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_custom_path.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_custom_port.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_upgrade_custom_port.yml
 
 ######### Matrix tests
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_upgrade.yml
-#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 playbooks/pmm2-client_integration_upgrade_custom_path.yml
+    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_upgrade.yml
+#    ansible-playbook -vv --connection=local --inventory 127.0.0.1, --limit 127.0.0.1 pmm2-client_integration_upgrade_custom_path.yml
 #########
       SHELL
 end