lando/core#71: Wait for user to clone repo + update devops

.github/workflows/pr-basic-tests.yml

@@ -11,9 +11,9 @@ jobs:
     strategy:
       matrix:
         leia-tests:
-          - examples/basics
+          - basics
         lando-versions:
-          - edge
+          - 3-dev
         os:
           - ubuntu-22.04
         node-version:
@@ -30,16 +30,13 @@ jobs:
           cache: yarn
       - name: Install Yarn dependencies
         run: yarn install --prefer-offline --frozen-lockfile
-
-      # This block should eventually become use lando/actions-hyperdrive@v2
-      - name: Verify Docker dependencies
-        run: |
-          docker --version | grep "20.10."
-          docker-compose --version | grep "1.29."
-      - name: Grab latest edge Lando CLI
-        run: |
-          sudo curl -fsSL -o /usr/local/bin/lando "https://files.lando.dev/cli/lando-linux-x64-${{ matrix.lando-versions }}"
-          sudo chmod +x /usr/local/bin/lando
+      - name: Setup lando ${{ matrix.lando-version }}
+        uses: lando/setup-lando@v2
+        with:
+          lando-version: ${{ matrix.lando-version }}
+          config: |
+            plugins.@lando/platformsh=/home/runner/work/platformsh/platformsh
+          telemetry: false
       - name: Move in lando config appropriate for testing
         run: |
           mkdir -p ~/.lando/cache
@@ -50,20 +47,10 @@ jobs:
         run: |
           lando version
           lando config --path plugins | grep platformsh | grep /home/runner/work/platformsh/platformsh || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)
-          cd ${{ matrix.leia-tests }}
-          lando config --path plugins | grep platformsh | grep dir | grep /home/runner/work/platformsh/platformsh || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)
-
-      # This block should eventually become use lando/actions-leia@v2
-      # @NOTE? Do we want a way for our leia-action to configure apparmor since
-      # this might break a whole bunch of tests? or is this literally just a thing
-      # for the platform.sh mysql/mariadb container?
-      - name: Configure apparmor
-        run: |
-          set -x
-          sudo apt-get remove mysql-server --purge
-          sudo apt-get install apparmor-profiles
-          sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
-      - name: Run leia tests
-        shell: bash
-        run: yarn leia "./${{ matrix.leia-tests }}/README.md" -c 'Destroy tests' --stdin --shell bash
-
+      - name: Run Leia Tests
+        uses: lando/run-leia-action@v2
+        with:
+          leia-test: "./examples/${{ matrix.leia-tests }}/README.md"
+          cleanup-header: "Destroy tests"
+          shell: bash
+          stdin: true

.github/workflows/pr-chrome-headless-tests.yml

@@ -11,9 +11,9 @@ jobs:
     strategy:
       matrix:
         leia-tests:
-          - examples/chrome-headless-73
+          - chrome-headless-73
         lando-versions:
-          - edge
+          - 3-dev
         os:
           - ubuntu-22.04
         node-version:
@@ -30,16 +30,13 @@ jobs:
           cache: yarn
       - name: Install Yarn dependencies
         run: yarn install --prefer-offline --frozen-lockfile
-
-      # This block should eventually become use lando/actions-hyperdrive@v2
-      - name: Verify Docker dependencies
-        run: |
-          docker --version | grep "20.10."
-          docker-compose --version | grep "1.29."
-      - name: Grab latest edge Lando CLI
-        run: |
-          sudo curl -fsSL -o /usr/local/bin/lando "https://files.lando.dev/cli/lando-linux-x64-${{ matrix.lando-versions }}"
-          sudo chmod +x /usr/local/bin/lando
+      - name: Setup lando ${{ matrix.lando-version }}
+        uses: lando/setup-lando@v2
+        with:
+          lando-version: ${{ matrix.lando-version }}
+          config: |
+            plugins.@lando/platformsh=/home/runner/work/platformsh/platformsh
+          telemetry: false
       - name: Move in lando config appropriate for testing
         run: |
           mkdir -p ~/.lando/cache
@@ -50,20 +47,10 @@ jobs:
         run: |
           lando version
           lando config --path plugins | grep platformsh | grep /home/runner/work/platformsh/platformsh || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)
-          cd ${{ matrix.leia-tests }}
-          lando config --path plugins | grep platformsh | grep dir | grep /home/runner/work/platformsh/platformsh || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)
-
-      # This block should eventually become use lando/actions-leia@v2
-      # @NOTE? Do we want a way for our leia-action to configure apparmor since
-      # this might break a whole bunch of tests? or is this literally just a thing
-      # for the platform.sh mysql/mariadb container?
-      - name: Configure apparmor
-        run: |
-          set -x
-          sudo apt-get remove mysql-server --purge
-          sudo apt-get install apparmor-profiles
-          sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
-      - name: Run leia tests
-        shell: bash
-        run: yarn leia "./${{ matrix.leia-tests }}/README.md" -c 'Destroy tests' --stdin --shell bash
-
+      - name: Run Leia Tests
+        uses: lando/run-leia-action@v2
+        with:
+          leia-test: "./examples/${{ matrix.leia-tests }}/README.md"
+          cleanup-header: "Destroy tests"
+          shell: bash
+          stdin: true

.github/workflows/pr-drupal8-sync-tests.yml

@@ -12,9 +12,9 @@ jobs:
     strategy:
       matrix:
         leia-tests:
-          - examples/drupal8-sync
+          - drupal8-sync
         lando-versions:
-          - edge
+          - 3-dev
         os:
           - ubuntu-22.04
         node-version:
@@ -31,16 +31,13 @@ jobs:
           cache: yarn
       - name: Install Yarn dependencies
         run: yarn install --prefer-offline --frozen-lockfile
-
-      # This block should eventually become use lando/actions-hyperdrive@v2
-      - name: Verify Docker dependencies
-        run: |
-          docker --version | grep "20.10."
-          docker-compose --version | grep "1.29."
-      - name: Grab latest edge Lando CLI
-        run: |
-          sudo curl -fsSL -o /usr/local/bin/lando "https://files.lando.dev/cli/lando-linux-x64-${{ matrix.lando-versions }}"
-          sudo chmod +x /usr/local/bin/lando
+      - name: Setup lando ${{ matrix.lando-version }}
+        uses: lando/setup-lando@v2
+        with:
+          lando-version: ${{ matrix.lando-version }}
+          config: |
+            plugins.@lando/platformsh=/home/runner/work/platformsh/platformsh
+          telemetry: false
       - name: Move in lando config appropriate for testing
         run: |
           mkdir -p ~/.lando/cache
@@ -50,18 +47,10 @@ jobs:
       - name: Verify Lando works and we are dogfooding this plugin for tests
         run: |
           lando version
-          lando config --path plugins | grep platformsh | grep /home/runner/work/platformsh/platformsh || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)
-
-      # This block should eventually become use lando/actions-leia@v2
-      # @NOTE? Do we want a way for our leia-action to configure apparmor since
-      # this might break a whole bunch of tests? or is this literally just a thing
-      # for the platform.sh mysql/mariadb container?
-      - name: Configure apparmor
-        run: |
-          set -x
-          sudo apt-get remove mysql-server --purge
-          sudo apt-get install apparmor-profiles
-          sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
-      - name: Run leia tests
-        shell: bash
-        run: yarn leia "./${{ matrix.leia-tests }}/README.md" -c 'Destroy tests' --stdin --shell bash
+          lando config --path plugins | grep platformsh | grep /home/runner/work/platformsh/platformsh || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)      - name: Run Leia Tests
+        uses: lando/run-leia-action@v2
+        with:
+          leia-test: "./examples/${{ matrix.leia-tests }}/README.md"
+          cleanup-header: "Destroy tests"
+          shell: bash
+          stdin: true

.github/workflows/pr-mariadb-tests.yml

@@ -11,15 +11,15 @@ jobs:
     strategy:
       matrix:
         leia-tests:
-          - examples/mariadb-10.0
-          - examples/mariadb-10.1
-          - examples/mariadb-10.2
-          - examples/mariadb-10.3
-          - examples/mariadb-10.4
+          - mariadb-10.0
+          - mariadb-10.1
+          - mariadb-10.2
+          - mariadb-10.3
+          - mariadb-10.4
           # This is known to not work and uses a later image
           # - examples/mariadb-10.5
         lando-versions:
-          - edge
+          - 3-dev
         os:
           - ubuntu-22.04
         node-version:
@@ -36,16 +36,13 @@ jobs:
           cache: yarn
       - name: Install Yarn dependencies
         run: yarn install --prefer-offline --frozen-lockfile
-
-      # This block should eventually become use lando/actions-hyperdrive@v2
-      - name: Verify Docker dependencies
-        run: |
-          docker --version | grep "20.10."
-          docker-compose --version | grep "1.29."
-      - name: Grab latest edge Lando CLI
-        run: |
-          sudo curl -fsSL -o /usr/local/bin/lando "https://files.lando.dev/cli/lando-linux-x64-${{ matrix.lando-versions }}"
-          sudo chmod +x /usr/local/bin/lando
+      - name: Setup lando ${{ matrix.lando-version }}
+        uses: lando/setup-lando@v2
+        with:
+          lando-version: ${{ matrix.lando-version }}
+          config: |
+            plugins.@lando/platformsh=/home/runner/work/platformsh/platformsh
+          telemetry: false
       - name: Move in lando config appropriate for testing
         run: |
           mkdir -p ~/.lando/cache
@@ -56,20 +53,10 @@ jobs:
         run: |
           lando version
           lando config --path plugins | grep platformsh | grep /home/runner/work/platformsh/platformsh || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)
-          cd ${{ matrix.leia-tests }}
-          lando config --path plugins | grep platformsh | grep dir | grep /home/runner/work/platformsh/platformsh || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)
-
-      # This block should eventually become use lando/actions-leia@v2
-      # @NOTE? Do we want a way for our leia-action to configure apparmor since
-      # this might break a whole bunch of tests? or is this literally just a thing
-      # for the platform.sh mysql/mariadb container?
-      - name: Configure apparmor
-        run: |
-          set -x
-          sudo apt-get remove mysql-server --purge
-          sudo apt-get install apparmor-profiles
-          sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
-      - name: Run leia tests
-        shell: bash
-        run: yarn leia "./${{ matrix.leia-tests }}/README.md" -c 'Destroy tests' --stdin --shell bash
-
+      - name: Run Leia Tests
+        uses: lando/run-leia-action@v2
+        with:
+          leia-test: "./examples/${{ matrix.leia-tests }}/README.md"
+          cleanup-header: "Destroy tests"
+          shell: bash
+          stdin: true

.github/workflows/pr-memcached-tests.yml

@@ -11,11 +11,11 @@ jobs:
     strategy:
       matrix:
         leia-tests:
-          - examples/memcached-1.6
-          - examples/memcached-1.5
+          - memcached-1.6
+          - memcached-1.5
           # - examples/memcached-1.4
         lando-versions:
-          - edge
+          - 3-dev
         os:
           - ubuntu-22.04
         node-version:
@@ -32,16 +32,13 @@ jobs:
           cache: yarn
       - name: Install Yarn dependencies
         run: yarn install --prefer-offline --frozen-lockfile
-
-      # This block should eventually become use lando/actions-hyperdrive@v2
-      - name: Verify Docker dependencies
-        run: |
-          docker --version | grep "20.10."
-          docker-compose --version | grep "1.29."
-      - name: Grab latest edge Lando CLI
-        run: |
-          sudo curl -fsSL -o /usr/local/bin/lando "https://files.lando.dev/cli/lando-linux-x64-${{ matrix.lando-versions }}"
-          sudo chmod +x /usr/local/bin/lando
+      - name: Setup lando ${{ matrix.lando-version }}
+        uses: lando/setup-lando@v2
+        with:
+          lando-version: ${{ matrix.lando-version }}
+          config: |
+            plugins.@lando/platformsh=/home/runner/work/platformsh/platformsh
+          telemetry: false
       - name: Move in lando config appropriate for testing
         run: |
           mkdir -p ~/.lando/cache
@@ -52,20 +49,10 @@ jobs:
         run: |
           lando version
           lando config --path plugins | grep platformsh | grep /home/runner/work/platformsh/platformsh || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)
-          cd ${{ matrix.leia-tests }}
-          lando config --path plugins | grep platformsh | grep dir | grep /home/runner/work/platformsh/platformsh || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)
-
-      # This block should eventually become use lando/actions-leia@v2
-      # @NOTE? Do we want a way for our leia-action to configure apparmor since
-      # this might break a whole bunch of tests? or is this literally just a thing
-      # for the platform.sh mysql/mariadb container?
-      - name: Configure apparmor
-        run: |
-          set -x
-          sudo apt-get remove mysql-server --purge
-          sudo apt-get install apparmor-profiles
-          sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
-      - name: Run leia tests
-        shell: bash
-        run: yarn leia "./${{ matrix.leia-tests }}/README.md" -c 'Destroy tests' --stdin --shell bash
-
+      - name: Run Leia Tests
+        uses: lando/run-leia-action@v2
+        with:
+          leia-test: "./examples/${{ matrix.leia-tests }}/README.md"
+          cleanup-header: "Destroy tests"
+          shell: bash
+          stdin: true