Temp: Pin XtraBackup version used at 2.4.24 for 5.7 tests (vitessio#1…

…0194) * Pin XtraBackup version used at 2.4.24 for 5.7 tests Signed-off-by: Matt Lord <[email protected]> * Explicitly define which clusters need XtraBackup Signed-off-by: Matt Lord <[email protected]> * Remove vtctlbackup_sharded_clustertest_heavy from needsXtraBackup list Signed-off-by: Matt Lord <[email protected]> * Look for github workflow changes in paths-filter Signed-off-by: Matt Lord <[email protected]> * Need to use sudo to install the deb Signed-off-by: Matt Lord <[email protected]> * Correct errant quote placement Signed-off-by: Matt Lord <[email protected]> * Install xtrabackup deps after installing the deb file Signed-off-by: Matt Lord <[email protected]> * Use apt install instead of dpkg Signed-off-by: Matt Lord <[email protected]> * Actually execute the generator 🤦 Signed-off-by: Matt Lord <[email protected]> * Improve comment Signed-off-by: Matt Lord <[email protected]> * Actions env var interpolation not working as expected... I suspect it may my usage of curly braces which could be impacting their usage of ${{FOO}} for things processed before sending to the runner. See: https://docs.github.com/en/actions/learn-github-actions/environment-variables#using-contexts-to-access-environment-variable-values Signed-off-by: Matt Lord <[email protected]> * Only include env var if xtrabackup is needed Signed-off-by: Matt Lord <[email protected]>
slackhq · May 3, 2022 · 333fbd2 · 333fbd2
1 parent d5ab571
commit 333fbd2
Show file tree

Hide file tree

Showing 76 changed files with 125 additions and 384 deletions.
diff --git a/.github/docker/cluster_test_12/Dockerfile b/.github/docker/cluster_test_12/Dockerfile
@@ -11,14 +11,6 @@ USER root
 RUN rm -rf /vt/src/vitess.io/vitess/*
 COPY . /vt/src/vitess.io/vitess
 
-# install XtraBackup
-RUN wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-RUN apt-get update
-RUN apt-get install -y gnupg2
-RUN dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-RUN apt-get update
-RUN apt-get install -y percona-xtrabackup-24
-
 # Set the working directory
 WORKDIR /vt/src/vitess.io/vitess
 

diff --git a/.github/docker/cluster_test_18/Dockerfile b/.github/docker/cluster_test_18/Dockerfile
@@ -11,14 +11,6 @@ USER root
 RUN rm -rf /vt/src/vitess.io/vitess/*
 COPY . /vt/src/vitess.io/vitess
 
-# install XtraBackup
-RUN wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-RUN apt-get update
-RUN apt-get install -y gnupg2
-RUN dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-RUN apt-get update
-RUN apt-get install -y percona-xtrabackup-24
-
 # Set the working directory
 WORKDIR /vt/src/vitess.io/vitess
 

diff --git a/.github/workflows/cluster_endtoend_12.yml b/.github/workflows/cluster_endtoend_12.yml
@@ -32,6 +32,7 @@ jobs:
               - 'config/**'
               - '.github/docker/**'
               - 'bootstrap.sh'
+              - '.github/workflows/**'
 
       - name: Build Docker Image
         if: steps.changes.outputs.end_to_end == 'true'

diff --git a/.github/workflows/cluster_endtoend_13.yml b/.github/workflows/cluster_endtoend_13.yml
@@ -36,6 +36,7 @@ jobs:
             - 'tools/**'
             - 'config/**'
             - 'bootstrap.sh'
+            - '.github/workflows/**'
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
@@ -69,12 +70,6 @@ jobs:
         # install JUnit report formatter
         go install github.com/jstemmer/go-junit-report@latest
 
-        wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get install -y gnupg2
-        sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get update
-        sudo apt-get install percona-xtrabackup-24
-
     - name: Setup launchable dependencies
       if: steps.changes.outputs.end_to_end == 'true'
       run: |

diff --git a/.github/workflows/cluster_endtoend_15.yml b/.github/workflows/cluster_endtoend_15.yml
@@ -36,6 +36,7 @@ jobs:
             - 'tools/**'
             - 'config/**'
             - 'bootstrap.sh'
+            - '.github/workflows/**'
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
@@ -69,12 +70,6 @@ jobs:
         # install JUnit report formatter
         go install github.com/jstemmer/go-junit-report@latest
 
-        wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get install -y gnupg2
-        sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get update
-        sudo apt-get install percona-xtrabackup-24
-
     - name: Setup launchable dependencies
       if: steps.changes.outputs.end_to_end == 'true'
       run: |

diff --git a/.github/workflows/cluster_endtoend_17.yml b/.github/workflows/cluster_endtoend_17.yml
@@ -36,6 +36,7 @@ jobs:
             - 'tools/**'
             - 'config/**'
             - 'bootstrap.sh'
+            - '.github/workflows/**'
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
@@ -69,12 +70,6 @@ jobs:
         # install JUnit report formatter
         go install github.com/jstemmer/go-junit-report@latest
 
-        wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get install -y gnupg2
-        sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get update
-        sudo apt-get install percona-xtrabackup-24
-
     - name: Setup launchable dependencies
       if: steps.changes.outputs.end_to_end == 'true'
       run: |

diff --git a/.github/workflows/cluster_endtoend_18.yml b/.github/workflows/cluster_endtoend_18.yml
@@ -32,6 +32,7 @@ jobs:
               - 'config/**'
               - '.github/docker/**'
               - 'bootstrap.sh'
+              - '.github/workflows/**'
 
       - name: Build Docker Image
         if: steps.changes.outputs.end_to_end == 'true'

diff --git a/.github/workflows/cluster_endtoend_19.yml b/.github/workflows/cluster_endtoend_19.yml
@@ -36,6 +36,7 @@ jobs:
             - 'tools/**'
             - 'config/**'
             - 'bootstrap.sh'
+            - '.github/workflows/**'
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
@@ -69,12 +70,6 @@ jobs:
         # install JUnit report formatter
         go install github.com/jstemmer/go-junit-report@latest
 
-        wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get install -y gnupg2
-        sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get update
-        sudo apt-get install percona-xtrabackup-24
-
     - name: Setup launchable dependencies
       if: steps.changes.outputs.end_to_end == 'true'
       run: |

diff --git a/.github/workflows/cluster_endtoend_20.yml b/.github/workflows/cluster_endtoend_20.yml
@@ -11,6 +11,12 @@ env:
   LAUNCHABLE_WORKSPACE: "vitess-app"
   GITHUB_PR_HEAD_SHA: "${{ github.event.pull_request.head.sha }}"
 
+  # This is used if we need to pin the xtrabackup version used in tests.
+  # Doing so here because 2.4.25 crashes in our 5.7 tests. See:
+  #   https://jira.percona.com/browse/PXB-2756
+  # If this is NOT set then the latest version available will be used.
+  XTRABACKUP_VERSION: "2.4.24-1"
+
 jobs:
   build:
     name: Run endtoend tests on Cluster (20)
@@ -36,6 +42,7 @@ jobs:
             - 'tools/**'
             - 'config/**'
             - 'bootstrap.sh'
+            - '.github/workflows/**'
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
@@ -69,11 +76,17 @@ jobs:
         # install JUnit report formatter
         go install github.com/jstemmer/go-junit-report@latest
 
-        wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
+        wget "https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb"
         sudo apt-get install -y gnupg2
-        sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+        sudo dpkg -i "percona-release_latest.$(lsb_release -sc)_all.deb"
         sudo apt-get update
-        sudo apt-get install percona-xtrabackup-24
+        if [[ -n $XTRABACKUP_VERSION ]]; then
+          debfile="percona-xtrabackup-24_$XTRABACKUP_VERSION.$(lsb_release -sc)_amd64.deb"
+          wget "https://repo.percona.com/pxb-24/apt/pool/main/p/percona-xtrabackup-24/$debfile"
+          sudo apt install -y "./$debfile"
+        else
+          sudo apt-get install -y percona-xtrabackup-24
+        fi
 
     - name: Setup launchable dependencies
       if: steps.changes.outputs.end_to_end == 'true'

diff --git a/.github/workflows/cluster_endtoend_21.yml b/.github/workflows/cluster_endtoend_21.yml
@@ -36,6 +36,7 @@ jobs:
             - 'tools/**'
             - 'config/**'
             - 'bootstrap.sh'
+            - '.github/workflows/**'
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
@@ -69,12 +70,6 @@ jobs:
         # install JUnit report formatter
         go install github.com/jstemmer/go-junit-report@latest
 
-        wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get install -y gnupg2
-        sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get update
-        sudo apt-get install percona-xtrabackup-24
-
     - name: Setup launchable dependencies
       if: steps.changes.outputs.end_to_end == 'true'
       run: |

diff --git a/.github/workflows/cluster_endtoend_22.yml b/.github/workflows/cluster_endtoend_22.yml
@@ -36,6 +36,7 @@ jobs:
             - 'tools/**'
             - 'config/**'
             - 'bootstrap.sh'
+            - '.github/workflows/**'
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
@@ -69,12 +70,6 @@ jobs:
         # install JUnit report formatter
         go install github.com/jstemmer/go-junit-report@latest
 
-        wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get install -y gnupg2
-        sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get update
-        sudo apt-get install percona-xtrabackup-24
-
     - name: Setup launchable dependencies
       if: steps.changes.outputs.end_to_end == 'true'
       run: |

diff --git a/.github/workflows/cluster_endtoend_24.yml b/.github/workflows/cluster_endtoend_24.yml
@@ -36,6 +36,7 @@ jobs:
             - 'tools/**'
             - 'config/**'
             - 'bootstrap.sh'
+            - '.github/workflows/**'
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
@@ -69,12 +70,6 @@ jobs:
         # install JUnit report formatter
         go install github.com/jstemmer/go-junit-report@latest
 
-        wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get install -y gnupg2
-        sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get update
-        sudo apt-get install percona-xtrabackup-24
-
     - name: Installing zookeeper and consul
       if: steps.changes.outputs.end_to_end == 'true'
       run: |

diff --git a/.github/workflows/cluster_endtoend_26.yml b/.github/workflows/cluster_endtoend_26.yml
@@ -36,6 +36,7 @@ jobs:
             - 'tools/**'
             - 'config/**'
             - 'bootstrap.sh'
+            - '.github/workflows/**'
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
@@ -69,12 +70,6 @@ jobs:
         # install JUnit report formatter
         go install github.com/jstemmer/go-junit-report@latest
 
-        wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get install -y gnupg2
-        sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get update
-        sudo apt-get install percona-xtrabackup-24
-
     - name: Setup launchable dependencies
       if: steps.changes.outputs.end_to_end == 'true'
       run: |

diff --git a/.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml b/.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml
@@ -36,6 +36,7 @@ jobs:
             - 'tools/**'
             - 'config/**'
             - 'bootstrap.sh'
+            - '.github/workflows/**'
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
@@ -69,12 +70,6 @@ jobs:
         # install JUnit report formatter
         go install github.com/jstemmer/go-junit-report@latest
 
-        wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get install -y gnupg2
-        sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get update
-        sudo apt-get install percona-xtrabackup-24
-
     - name: Setup launchable dependencies
       if: steps.changes.outputs.end_to_end == 'true'
       run: |

diff --git a/.github/workflows/cluster_endtoend_mysql80.yml b/.github/workflows/cluster_endtoend_mysql80.yml
@@ -36,6 +36,7 @@ jobs:
             - 'tools/**'
             - 'config/**'
             - 'bootstrap.sh'
+            - '.github/workflows/**'
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
@@ -78,12 +79,6 @@ jobs:
         # install JUnit report formatter
         go install github.com/jstemmer/go-junit-report@latest
 
-        wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get install -y gnupg2
-        sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get update
-        sudo apt-get install percona-xtrabackup-24
-
     - name: Setup launchable dependencies
       if: steps.changes.outputs.end_to_end == 'true'
       run: |

diff --git a/.github/workflows/cluster_endtoend_onlineddl_declarative.yml b/.github/workflows/cluster_endtoend_onlineddl_declarative.yml
@@ -36,6 +36,7 @@ jobs:
             - 'tools/**'
             - 'config/**'
             - 'bootstrap.sh'
+            - '.github/workflows/**'
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
@@ -69,12 +70,6 @@ jobs:
         # install JUnit report formatter
         go install github.com/jstemmer/go-junit-report@latest
 
-        wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get install -y gnupg2
-        sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get update
-        sudo apt-get install percona-xtrabackup-24
-
     - name: Setup launchable dependencies
       if: steps.changes.outputs.end_to_end == 'true'
       run: |

diff --git a/.github/workflows/cluster_endtoend_onlineddl_ghost.yml b/.github/workflows/cluster_endtoend_onlineddl_ghost.yml
@@ -36,6 +36,7 @@ jobs:
             - 'tools/**'
             - 'config/**'
             - 'bootstrap.sh'
+            - '.github/workflows/**'
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
@@ -69,12 +70,6 @@ jobs:
         # install JUnit report formatter
         go install github.com/jstemmer/go-junit-report@latest
 
-        wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get install -y gnupg2
-        sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get update
-        sudo apt-get install percona-xtrabackup-24
-
     - name: Setup launchable dependencies
       if: steps.changes.outputs.end_to_end == 'true'
       run: |

diff --git a/.github/workflows/cluster_endtoend_onlineddl_revert.yml b/.github/workflows/cluster_endtoend_onlineddl_revert.yml
@@ -36,6 +36,7 @@ jobs:
             - 'tools/**'
             - 'config/**'
             - 'bootstrap.sh'
+            - '.github/workflows/**'
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
@@ -69,12 +70,6 @@ jobs:
         # install JUnit report formatter
         go install github.com/jstemmer/go-junit-report@latest
 
-        wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get install -y gnupg2
-        sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get update
-        sudo apt-get install percona-xtrabackup-24
-
     - name: Setup launchable dependencies
       if: steps.changes.outputs.end_to_end == 'true'
       run: |

diff --git a/.github/workflows/cluster_endtoend_onlineddl_revertible.yml b/.github/workflows/cluster_endtoend_onlineddl_revertible.yml
@@ -36,6 +36,7 @@ jobs:
             - 'tools/**'
             - 'config/**'
             - 'bootstrap.sh'
+            - '.github/workflows/**'
 
     - name: Set up Go
       if: steps.changes.outputs.end_to_end == 'true'
@@ -69,12 +70,6 @@ jobs:
         # install JUnit report formatter
         go install github.com/jstemmer/go-junit-report@latest
 
-        wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get install -y gnupg2
-        sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
-        sudo apt-get update
-        sudo apt-get install percona-xtrabackup-24
-
     - name: Setup launchable dependencies
       if: steps.changes.outputs.end_to_end == 'true'
       run: |