Build fixes (#1319)

* Only x86 * Only x86 * actions/upload-artifact@v4 - updating deprecated action * actions/upload-artifact@v4 - updating deprecated action * actions/upload-artifact@v4 - updating deprecated action * actions/upload-artifact@v4 - updating deprecated action * using installed skopeo instead of a docker image * Revert "Only x86" This reverts commit 0c22963. * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags * don't run GHAs on version tags
scalyr · Feb 25, 2025 · fc4a174 · fc4a174
1 parent 84a9353
commit fc4a174
Show file tree

Hide file tree

Showing 17 changed files with 101 additions and 173 deletions.
diff --git a/.github/actions/install_python_and_requirements/action.yml b/.github/actions/install_python_and_requirements/action.yml
@@ -40,4 +40,5 @@ runs:
       shell: bash
       working-directory: ${{ github.workspace }}
       run: |
-        python3 -m pip install -r dev-requirements-new.txt --no-index --find-links wheels
+        python3 -m pip install -r dev-requirements-new.txt --no-index --find-links wheels || echo "Installing from cached wheels failed, trying to install from PyPI"
+        python3 -m pip install -r dev-requirements-new.txt
diff --git a/.github/workflows/build-container-images.yml b/.github/workflows/build-container-images.yml
@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - master
-    tags:
-      - v*.*.*
   pull_request:
     branches:
       - master

diff --git a/.github/workflows/build-linux-packages.yml b/.github/workflows/build-linux-packages.yml
@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - master
-    tags:
-      - v*.*.*
   pull_request:
     branches:
       - master

diff --git a/.github/workflows/build-tarball.yml b/.github/workflows/build-tarball.yml
@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - master
-    tags:
-      - v*.*.*
   pull_request:
     branches:
       - master
@@ -38,7 +36,7 @@ jobs:
           popd
 
       - name: Save tarball as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: tarball-noarch
           path: build

diff --git a/.github/workflows/build-windows-package.yml b/.github/workflows/build-windows-package.yml
@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - master
-    tags:
-      - v*.*.*
   pull_request:
     branches:
       - master
@@ -37,7 +35,7 @@ jobs:
         run: python build_package.py win32
 
       - name: Save installer as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: windows-msi
           path: ScalyrAgentInstaller-*.msi

diff --git a/.github/workflows/codespeed-benchmarks.yml b/.github/workflows/codespeed-benchmarks.yml
@@ -81,7 +81,7 @@ jobs:
           python benchmarks/scripts/send_microbenchmarks_data_to_codespeed.py --data-path="benchmark_results/*.json" --debug
 
       - name: Store artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: codespeed-micro-benchmarks-${{ matrix.python-version }}
           path: |

diff --git a/.github/workflows/reusable-agent-build-container-images.yml b/.github/workflows/reusable-agent-build-container-images.yml
@@ -238,7 +238,7 @@ jobs:
             --output-dir ./build
       
       - name: Save image OCI tarball as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: container-image-tarball-${{  matrix.variant.image_type }}-${{ inputs.builder_name }}
           path: build
@@ -325,7 +325,7 @@ jobs:
           minikube image load busybox:1.28
 
       - name: Download OCI tarball of the built image.
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3
+        uses: actions/download-artifact@v4
         with:
           name: container-image-tarball-k8s-${{ inputs.builder_name }}
           path: /tmp/image_tarball
@@ -355,7 +355,7 @@ jobs:
           fi
 
       - name: Upload Agent k8s Test Docker Image as artifact for debugging purposses
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: k8s-image-${{ inputs.builder_name }}
           path: build
@@ -667,7 +667,7 @@ jobs:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Download OCI tarball of the built image.
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3
+        uses: actions/download-artifact@v4
         with:
           name: container-image-tarball-k8s-${{ inputs.builder_name }}
           path: /tmp/image_tarball
@@ -874,7 +874,7 @@ jobs:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Download OCI tarball of the built image.
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3
+        uses: actions/download-artifact@v4
         with:
           name: container-image-tarball-k8s-${{ inputs.builder_name }}
           path: /tmp/image_tarball
@@ -906,7 +906,7 @@ jobs:
           source ./.circleci/smoketest_k8s.sh scalyr/scalyr-agent-ci-unittest:4 150 no_delete_existing_k8s_objs k8s-image:test
 
       - name: Upload test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: k8s-smoketest
           path: |
@@ -976,7 +976,7 @@ jobs:
         uses: crazy-max/ghaction-github-runtime@715c25b40ccc0df9b62bfa8be3ccc57d09dbc4b1
 
       - name: Download OCI tarball of the built image.
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3
+        uses: actions/download-artifact@v4
         with:
           name: container-image-tarball-${{ matrix.variant.image_type }}-${{ inputs.builder_name }}
           path: /tmp/image_tarball
@@ -1007,7 +1007,7 @@ jobs:
           source ./.circleci/smoketest_docker.sh scalyr/scalyr-agent-ci-unittest:4 ${{ matrix.variant.image_type }} ${{ matrix.variant.timeout }} ${{ matrix.variant.image_type }}-${{ inputs.builder_name }}:test
 
       - name: Upload test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docker-smoketest-${{ matrix.variant.image_type }}-${{ inputs.builder_name }}
           path: |
@@ -1050,7 +1050,7 @@ jobs:
           python_version: ${{ inputs.python_version }}
 
       - name: Download OCI tarball of the built image.
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3
+        uses: actions/download-artifact@v4
         with:
           name: container-image-tarball-${{ matrix.variant.image_type }}-${{ inputs.builder_name }}
           path: /tmp/image_tarball
@@ -1079,6 +1079,11 @@ jobs:
             echo "tags=empty" >> "${GITHUB_OUTPUT}"
           fi
 
+      - name: Set up skopeo
+        uses: warjiang/setup-skopeo@latest
+        with:
+          version: latest
+
       - name: Publish image
         if: steps.verify.outputs.tags != 'empty'
         run: |

diff --git a/.github/workflows/reusable-agent-build-linux-packages-new.yml b/.github/workflows/reusable-agent-build-linux-packages-new.yml
@@ -160,9 +160,9 @@ jobs:
             --package-type ${{ matrix.variant.package_type }}
 
       - name: Save packages as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: linux-packages-${{ matrix.variant.builder_name }}
+          name: linux-packages-${{ matrix.variant.builder_name }}-${{ matrix.variant.package_type }}
           path: build
           retention-days: 1
 
@@ -212,11 +212,15 @@ jobs:
           driver-opts: network=host
 
       - name: Download built packages.
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3
+        uses: actions/download-artifact@v4
         with:
-          name:  linux-packages-${{ matrix.test_target.builder }}
+          name:  linux-packages-${{ matrix.test_target.builder }}-${{ matrix.test_target.package_type }}
           path: /tmp/packages
 
+      - name: Debug - List downloaded packages
+        run: |
+          find /tmp/packages
+
       - name: Expose GitHub Runtime To Be Able to Use GHA Cache By Docker.
         uses: crazy-max/ghaction-github-runtime@715c25b40ccc0df9b62bfa8be3ccc57d09dbc4b1
 

diff --git a/.github/workflows/reusable-codespeed-agent-benchmarks.yaml b/.github/workflows/reusable-codespeed-agent-benchmarks.yaml
@@ -154,7 +154,7 @@ jobs:
           ./benchmarks/scripts/send-log-level-counts-to-codespeed.sh "${{ github.sha }}"
 
       - name: Upload log artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: agent-logs-${{ inputs.agent_server_host }}
           path: |

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -88,7 +88,7 @@ jobs:
           KIND: unittests
 
       - name: Upload pytest test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pytest-results-${{ matrix.python-version }}-${{ matrix.platform }}
           path: |
@@ -153,7 +153,7 @@ jobs:
           AGENT_HOST_NAME: monitors-test-${{ github.run_number }}
 
       - name: Upload pytest test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pytest-results-${{ matrix.python-version }}-monitor-smoketests
           path: |
@@ -228,7 +228,7 @@ jobs:
           KIND: end2end
 
       - name: Upload pytest test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pytest-results-${{ matrix.python-version }}-${{ matrix.variant }}
           path: |
@@ -247,7 +247,7 @@ jobs:
       - monitor-smoketests
     steps:
       - name: Download test results
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3
+        uses: actions/download-artifact@v4
         with:
           path: reports
       - name: Publish Test Results

diff --git a/agent_build_refactored/container_images/base_image_alpine.txt b/agent_build_refactored/container_images/base_image_alpine.txt
@@ -0,0 +1 @@
+alpine:3.19.4
diff --git a/agent_build_refactored/container_images/base_image_ubuntu-fips.txt b/agent_build_refactored/container_images/base_image_ubuntu-fips.txt
@@ -0,0 +1 @@
+artifactory.eng.sentinelone.tech/docker-release/common/ubuntu-base/python311:2.0.48
diff --git a/agent_build_refactored/container_images/base_image_ubuntu.txt b/agent_build_refactored/container_images/base_image_ubuntu.txt
@@ -0,0 +1 @@
+ubuntu:20.04
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,8 +4,6 @@ on: @@
       push:
         branches:
           - master
-        tags:
-          - v*.*.*
       pull_request:
         branches:
           - master
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		artifactory.eng.sentinelone.tech/docker-release/common/ubuntu-base/python311:2.0.48