chore: upgrade lerna and remove remaining saucelabs code (#1645)

Author: david-luna

.ci/docker/node-puppeteer/Dockerfile

@@ -4,13 +4,13 @@ FROM ubuntu:jammy
 ARG NODEJS_VERSION
 
 # Install node
- RUN apt-get update && apt-get install -y ca-certificates curl gnupg && \
- mkdir -p /etc/apt/keyrings && \
- curl -sL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
- echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODEJS_VERSION.x nodistro main" | \
- tee /etc/apt/sources.list.d/nodesource.list && \
- apt-get update && apt-get install nodejs -y && \
- rm -rf /etc/apt/keyrings && rm /etc/apt/sources.list.d/nodesource.list
+RUN apt-get update && apt-get install -y ca-certificates curl gnupg && \
+mkdir -p /etc/apt/keyrings && \
+curl -sL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODEJS_VERSION.x nodistro main" | \
+tee /etc/apt/sources.list.d/nodesource.list && \
+apt-get update && apt-get install nodejs -y && \
+rm -rf /etc/apt/keyrings && rm /etc/apt/sources.list.d/nodesource.list
 
 # the node-gyp we use is only compatible with Python versions less than 3.10,
 # so we need to make sure we use a previous version

.ci/scripts/load-testing.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-STACK_VERSION=${1:-8.6.1}
+STACK_VERSION=${1:-8.19.5}
 USER_ID="$(id -u):$(id -g)"
 # The migration of this to Node.js 18 will wait. To update playwright (and browsers)
 # to make it work in Node.js 18 and latest version in ubuntu (or another OS)

.ci/scripts/pull_and_build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 export NODEJS_VERSION=$(cat .nvmrc)
-export STACK_VERSION=${STACK_VERSION:-8.6.1}
+export STACK_VERSION=${STACK_VERSION:-8.19.5}
 
 STACK_VERSION=${STACK_VERSION} \
 docker --log-level INFO compose -f ./dev-utils/docker-compose.yml pull --quiet --ignore-pull-failures

.ci/scripts/test.sh

@@ -1,23 +1,11 @@
 #!/usr/bin/env bash
 set -xo pipefail
 
-STACK_VERSION=${STACK_VERSION:-"8.6.1"}
+STACK_VERSION=${STACK_VERSION:-"8.19.5"}
 APM_SERVER_PORT=${APM_SERVER_PORT:-"8200"}
 APM_SERVER_URL=${APM_SERVER_URL:-"http://apm-server:8200"}
 KIBANA_URL=${KIBANA_URL:-"http://kibana:5601"}
 
-# As long as there are issues with the ssl lets use 6.1.3
-# see https://github.com/docker/docker-py/issues/3194
-pip3 uninstall docker
-pip3 install docker==6.1.3
-
-pip install docker-compose>=1.25.4
-
-# https://github.com/docker/docker-py/issues/3256
-pip3 uninstall requests
-pip3 install requests==2.31.0
-
-
 # Tests are run within the node-puppeteer container and can fails.
 # To avoid flakiness, we retry up to 3 times to run them.
 for i in {1..3};
@@ -34,10 +22,15 @@ do
     --quiet-pull \
     --exit-code-from node-puppeteer \
     --remove-orphans \
-    node-puppeteer;
+    node-puppeteer \
+    >docker-compose.log 2>docker-compose.err;
     status=${?}
     if [ "${status}" -eq "0" ]; then
       break
+    else
+      echo "Docker compose failed, see the below log output"
+      cat docker-compose.log && rm docker-compose.log
+      cat docker-compose.err && rm docker-compose.err
     fi
   sleep 5;
 done

.github/workflows/ci-saucelabs.yml

@@ -65,7 +65,7 @@ jobs:
     strategy:
       matrix:
         stack-version:
-          - '8.0.0-SNAPSHOT'
+          - '8.2.0-SNAPSHOT'
           - '8.19.5'
         scope:
           - '@elastic/apm-rum'
@@ -75,6 +75,7 @@ jobs:
           - '@elastic/apm-rum-vue'
     steps:
       - uses: actions/checkout@v5
+
       - name: Run puppeteer tests
         uses: ./.github/workflows/run-test
         with:
@@ -87,14 +88,6 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      # Temporary fix for "ValueError: invalid mode: 'rU' while trying to load binding.gyp"
-      # See https://github.com/nodejs/node-gyp/issues/2219
-      # This can be removed when "node-gyp" is updated
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.10'
-
       - uses: actions/setup-node@v5
         with:
           node-version-file: '.nvmrc'

.github/workflows/ci.yml

@@ -41,14 +41,6 @@ jobs:
         with:
           github-token: ${{ steps.get_token.outputs.token }}
 
-      # Temporary fix for "ValueError: invalid mode: 'rU' while trying to load binding.gyp"
-      # See https://github.com/nodejs/node-gyp/issues/2219
-      # This can be removed when "node-gyp" is updated
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.10'
-
       - uses: actions/setup-node@v5
         with:
           node-version-file: '.nvmrc'

.github/workflows/pre-release.yml

@@ -52,14 +52,6 @@ jobs:
         with:
           github-token: ${{ steps.get_token.outputs.token }}
 
-      # Temporary fix for "ValueError: invalid mode: 'rU' while trying to load binding.gyp"
-      # See https://github.com/nodejs/node-gyp/issues/2219
-      # This can be removed when "node-gyp" is updated
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.10'
-
       - uses: actions/setup-node@v5
         with:
           node-version-file: '.nvmrc'

.github/workflows/release.yml

@@ -20,13 +20,6 @@ inputs:
     type: choice
     options:
       - none
-      - saucelabs
-  sauce-username:
-    description: 'Sauce username'
-    required: false
-  sauce-access-key:
-    description: 'Sauce access key'
-    required: false
 
 runs:
   using: "composite"
@@ -37,17 +30,6 @@ runs:
     - name: Pull and build docker infra
       run: './.ci/scripts/pull_and_build.sh'
       shell: bash
-    - if: |
-        (inputs.mode == 'saucelabs')
-        && (inputs.sauce-access-key != null && inputs.sauce-access-key != '')
-        && (inputs.sauce-username != null && inputs.sauce-username != '')
-      shell: bash
-      run: |
-        echo "SAUCE_ACCESS_KEY=$SAUCE_ACCESS_KEY" >> $GITHUB_ENV
-        echo "SAUCE_USERNAME=$SAUCE_USERNAME" >> $GITHUB_ENV
-      env:
-        SAUCE_ACCESS_KEY: ${{ inputs.sauce-access-key }}
-        SAUCE_USERNAME: ${{ inputs.sauce-username }}
     - name: Run tests Elastic Stack ${{ matrix.stack-version }} - ${{ matrix.scope }} - ${{ fromJSON('{"none":"Puppeteer"}')[inputs.mode] || inputs.mode }}
       run: './.ci/scripts/test.sh'
       shell: bash
@@ -70,9 +52,3 @@ runs:
         name: test-results-${{ steps.slug.outputs.slug }}
         path: |
           packages/**/reports/TESTS-*.xml
-    - name: Reset environment
-      if: always()
-      shell: bash
-      run: |
-        echo "SAUCE_ACCESS_KEY=" >> $GITHUB_ENV
-        echo "SAUCE_USERNAME="   >> $GITHUB_ENV

.github/workflows/run-test/action.yml

@@ -5,7 +5,6 @@ on:
   workflow_run:
     workflows:
       - ci
-      - ci-saucelabs
     types:
       - completed