Move packaging to its own top level folder

signalfx · Oct 11, 2024 · 3398a6e · 3398a6e
1 parent be45c91
commit 3398a6e
Show file tree

Hide file tree

Showing 244 changed files with 1,063 additions and 1,057 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -90,21 +90,25 @@ updates:
     schedule:
       interval: "weekly"
   - package-ecosystem: "pip"
-    directory: "/internal/buildscripts/packaging/release"
+    directory: "/internal/signalfx-agent/bundle/python"
     schedule:
       interval: "weekly"
   - package-ecosystem: "pip"
-    directory: "/internal/buildscripts/packaging/tests"
+    directory: "/packaging/release"
     schedule:
       interval: "weekly"
   - package-ecosystem: "pip"
-    directory: "/internal/signalfx-agent/bundle/python"
+    directory: "/packaging/tests"
     schedule:
       interval: "weekly"
   - package-ecosystem: "docker"
     directory: "/cmd/otelcol"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "docker"
+    directory: "/cmd/otelcol/fips"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "docker"
     directory: "/docker/activemq"
     schedule:
@@ -126,15 +130,15 @@ updates:
     schedule:
       interval: "weekly"
   - package-ecosystem: "docker"
-    directory: "/docker/haproxy"
+    directory: "/docker/elasticsearch"
     schedule:
       interval: "weekly"
   - package-ecosystem: "docker"
-    directory: "/docker/httpd"
+    directory: "/docker/haproxy"
     schedule:
       interval: "weekly"
   - package-ecosystem: "docker"
-    directory: "/docker/httpd-discovery"
+    directory: "/docker/httpd"
     schedule:
       interval: "weekly"
   - package-ecosystem: "docker"
@@ -206,15 +210,15 @@ updates:
     schedule:
       interval: "weekly"
   - package-ecosystem: "docker"
-    directory: "/internal/buildscripts/packaging/fpm"
+    directory: "/internal/signalfx-agent/bundle"
     schedule:
       interval: "weekly"
   - package-ecosystem: "docker"
-    directory: "/internal/buildscripts/packaging/msi/msi-builder"
+    directory: "/packaging/fpm"
     schedule:
       interval: "weekly"
   - package-ecosystem: "docker"
-    directory: "/internal/signalfx-agent/bundle"
+    directory: "/packaging/msi/msi-builder"
     schedule:
       interval: "weekly"
   - package-ecosystem: "maven"
@@ -226,11 +230,11 @@ updates:
     schedule:
       interval: "weekly"
   - package-ecosystem: "nuget"
-    directory: "/internal/buildscripts/packaging/msi/SplunkCustomActions/src"
+    directory: "/packaging/msi/SplunkCustomActions/src"
     schedule:
       interval: "weekly"
   - package-ecosystem: "nuget"
-    directory: "/internal/buildscripts/packaging/msi/SplunkCustomActions/test"
+    directory: "/packaging/msi/SplunkCustomActions/test"
     schedule:
       interval: "weekly"
   - package-ecosystem: "nuget"

diff --git a/.github/workflows/auto-instrumentation.yml b/.github/workflows/auto-instrumentation.yml
@@ -19,7 +19,7 @@ concurrency:
 env:
   PYTHON_VERSION: '3.11'
   PIP_VERSION: '22.0.4'
-  REQUIREMENTS_PATH: "internal/buildscripts/packaging/tests/requirements.txt"
+  REQUIREMENTS_PATH: "packaging/tests/requirements.txt"
   GO_VERSION: 1.22.7
 
 jobs:
@@ -90,9 +90,9 @@ jobs:
         id: get-matrix
         run: |
           # create test matrix for distro and arch
-          dockerfiles=$(find internal/buildscripts/packaging/tests/instrumentation/images/ -name "Dockerfile.*" | cut -d '.' -f2- | sort -u)
+          dockerfiles=$(find packaging/tests/instrumentation/images/ -name "Dockerfile.*" | cut -d '.' -f2- | sort -u)
           if [ -z "$dockerfiles" ]; then
-            echo "Failed to get dockerfiles from internal/buildscripts/packaging/tests/instrumentation/images!" >&2
+            echo "Failed to get dockerfiles from packaging/tests/instrumentation/images!" >&2
             exit 1
           fi
           distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done)
@@ -120,7 +120,7 @@ jobs:
       - name: Get package type for ${{ matrix.DISTRO }}
         run: |
           for pkg in "deb" "rpm"; do
-            if [[ -f "internal/buildscripts/packaging/tests/instrumentation/images/${pkg}/Dockerfile.${{ matrix.DISTRO }}" ]]; then
+            if [[ -f "packaging/tests/instrumentation/images/${pkg}/Dockerfile.${{ matrix.DISTRO }}" ]]; then
               echo "SYS_PACKAGE=${pkg}" >> $GITHUB_ENV
               exit 0
             fi
@@ -172,7 +172,7 @@ jobs:
           fi
           testcase="${{ matrix.TESTCASE }} or uninstall"
           python3 -u -m pytest -s --verbose -k "$distro and ${{ matrix.ARCH }} and ($testcase)" \
-            internal/buildscripts/packaging/tests/instrumentation/instrumentation_test.py
+            packaging/tests/instrumentation/instrumentation_test.py
 
       # qemu, networking, running systemd in containers, etc., can be flaky
       - name: Re-run failed tests
@@ -186,4 +186,4 @@ jobs:
           testcase="${{ matrix.TESTCASE }} or uninstall"
           python3 -u -m pytest -s --verbose -k "$distro and ${{ matrix.ARCH }} and ($testcase)" \
             --last-failed \
-            internal/buildscripts/packaging/tests/instrumentation/instrumentation_test.py
+            packaging/tests/instrumentation/instrumentation_test.py
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -17,7 +17,7 @@ on:
       - 'go.mod'
       - 'go.sum'
       - '!**.md'
-      - '!internal/buildscripts/packaging/**'
+      - '!packaging/**'
 
 concurrency:
   group: build-and-test-${{ github.event.pull_request.number || github.ref }}

diff --git a/.github/workflows/darwin-test.yml b/.github/workflows/darwin-test.yml
@@ -16,7 +16,7 @@ on:
       - 'go.mod'
       - 'go.sum'
       - '!**.md'
-      - '!internal/buildscripts/**'
+      - '!packaging/**'
 
 env:
   GO_VERSION: '1.22.7'

diff --git a/.github/workflows/installer-script-test.yml b/.github/workflows/installer-script-test.yml
@@ -8,11 +8,11 @@ on:
   pull_request:
     paths:
       - '.github/workflows/installer-script-test.yml'
-      - 'internal/buildscripts/packaging/installer/install.sh'
-      - 'internal/buildscripts/packaging/tests/helpers/**'
-      - 'internal/buildscripts/packaging/tests/images/**'
-      - 'internal/buildscripts/packaging/tests/installer_test.py'
-      - 'internal/buildscripts/packaging/tests/requirements.txt'
+      - 'packaging/installer/install.sh'
+      - 'packaging/tests/helpers/**'
+      - 'packaging/tests/images/**'
+      - 'packaging/tests/installer_test.py'
+      - 'packaging/tests/requirements.txt'
 
 concurrency:
   group: installer-script-test-${{ github.event.pull_request.number || github.ref }}
@@ -29,9 +29,9 @@ jobs:
         id: get-matrix
         run: |
           # create test matrix for distro images and archs
-          dockerfiles=$(ls internal/buildscripts/packaging/tests/images/deb/Dockerfile.* internal/buildscripts/packaging/tests/images/rpm/Dockerfile.* | cut -d '.' -f2- | sort -u)
+          dockerfiles=$(ls packaging/tests/images/deb/Dockerfile.* packaging/tests/images/rpm/Dockerfile.* | cut -d '.' -f2- | sort -u)
           if [ -z "$dockerfiles" ]; then
-            echo "Failed to get dockerfiles from internal/buildscripts/packaging/tests/images!" >&2
+            echo "Failed to get dockerfiles from packaging/tests/images!" >&2
             exit 1
           fi
           distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done)
@@ -55,7 +55,7 @@ jobs:
     env:
       PYTHON_VERSION: '3.11'
       PIP_VERSION: '22.0.4'
-      REQUIREMENTS_PATH: "internal/buildscripts/packaging/tests/requirements.txt"
+      REQUIREMENTS_PATH: "packaging/tests/requirements.txt"
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
@@ -98,7 +98,7 @@ jobs:
             tests="$distro and ${{ matrix.ARCH }} and ${{ matrix.INSTRUMENTATION }}"
           fi
           python3 -u -m pytest -s --verbose -k "$tests" \
-            internal/buildscripts/packaging/tests/installer_test.py
+            packaging/tests/installer_test.py
 
       # qemu, networking, running systemd in containers, etc., can be flaky
       - name: Re-run failed tests
@@ -116,4 +116,4 @@ jobs:
           fi
           python3 -u -m pytest -s --verbose -k "$tests" \
             --last-failed \
-            internal/buildscripts/packaging/tests/installer_test.py
+            packaging/tests/installer_test.py
diff --git a/.github/workflows/linux-package-test.yml b/.github/workflows/linux-package-test.yml
@@ -20,7 +20,7 @@ concurrency:
 env:
   PYTHON_VERSION: '3.11'
   PIP_VERSION: '22.0.4'
-  REQUIREMENTS_PATH: "internal/buildscripts/packaging/tests/requirements.txt"
+  REQUIREMENTS_PATH: "packaging/tests/requirements.txt"
   GO_VERSION: 1.22.7
 
 jobs:
@@ -146,9 +146,9 @@ jobs:
         id: get-matrix
         run: |
           # create test matrix for distro and arch
-          dockerfiles=$(find internal/buildscripts/packaging/tests/images/ -name "Dockerfile.*" | cut -d '.' -f2- | sort -u)
+          dockerfiles=$(find packaging/tests/images/ -name "Dockerfile.*" | cut -d '.' -f2- | sort -u)
           if [ -z "$dockerfiles" ]; then
-            echo "Failed to get dockerfiles from internal/buildscripts/packaging/tests/images!" >&2
+            echo "Failed to get dockerfiles from packaging/tests/images!" >&2
             exit 1
           fi
           distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done)
@@ -174,7 +174,7 @@ jobs:
       - name: Get package type for ${{ matrix.DISTRO }}
         run: |
           for pkg in "deb" "rpm" "tar"; do
-            if [[ -f "internal/buildscripts/packaging/tests/images/${pkg}/Dockerfile.${{ matrix.DISTRO }}" ]]; then
+            if [[ -f "packaging/tests/images/${pkg}/Dockerfile.${{ matrix.DISTRO }}" ]]; then
               echo "SYS_PACKAGE=${pkg}" >> $GITHUB_ENV
               exit 0
             fi
@@ -221,7 +221,7 @@ jobs:
           fi
           python3 -u -m pytest -s --verbose -m "${{ env.SYS_PACKAGE }}" \
             -k "$distro and ${{ matrix.ARCH }}" \
-            internal/buildscripts/packaging/tests/package_test.py
+            packaging/tests/package_test.py
 
       # qemu, networking, running systemd in containers, etc., can be flaky
       - name: Re-run failed tests
@@ -235,7 +235,7 @@ jobs:
           python3 -u -m pytest -s --verbose -m "${{ env.SYS_PACKAGE }}" \
             -k "$distro and ${{ matrix.ARCH }}" \
             --last-failed \
-            internal/buildscripts/packaging/tests/package_test.py
+            packaging/tests/package_test.py
 
   docker-otelcol:
     # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved

diff --git a/.github/workflows/otelcol-fips.yml b/.github/workflows/otelcol-fips.yml
@@ -16,7 +16,7 @@ on:
       - 'go.mod'
       - 'go.sum'
       - '!**.md'
-      - '!internal/buildscripts/**'
+      - '!packaging/**'
 
 concurrency:
   group: otelcol-fips-${{ github.event.pull_request.number || github.ref }}

diff --git a/.github/workflows/puppet-test.yml b/.github/workflows/puppet-test.yml
@@ -8,17 +8,17 @@ on:
     paths:
       - '.github/workflows/puppet-test.yml'
       - 'deployments/puppet/**'
-      - 'internal/buildscripts/packaging/tests/deployments/puppet/**'
-      - 'internal/buildscripts/packaging/tests/helpers/**'
-      - 'internal/buildscripts/packaging/tests/requirements.txt'
+      - 'packaging/tests/deployments/puppet/**'
+      - 'packaging/tests/helpers/**'
+      - 'packaging/tests/requirements.txt'
       - '!**.md'
   pull_request:
     paths:
       - '.github/workflows/puppet-test.yml'
       - 'deployments/puppet/**'
-      - 'internal/buildscripts/packaging/tests/deployments/puppet/**'
-      - 'internal/buildscripts/packaging/tests/helpers/**'
-      - 'internal/buildscripts/packaging/tests/requirements.txt'
+      - 'packaging/tests/deployments/puppet/**'
+      - 'packaging/tests/helpers/**'
+      - 'packaging/tests/requirements.txt'
       - '!**.md'
   schedule:
     - cron: '0 0 * * 3,6' # Every Wednesday and Saturday at midnight UTC
@@ -29,7 +29,7 @@ concurrency:
 
 env:
   PYTHON_VERSION: "3.11"
-  REQUIREMENTS_PATH: "internal/buildscripts/packaging/tests/requirements.txt"
+  REQUIREMENTS_PATH: "packaging/tests/requirements.txt"
 
 jobs:
   puppet-lint:
@@ -66,9 +66,9 @@ jobs:
         id: get-matrix
         run: |
           # create test matrix for distro and arch
-          dockerfiles=$(find internal/buildscripts/packaging/tests/deployments/puppet/images/ -name "Dockerfile.*" | cut -d '.' -f2- | sort -u)
+          dockerfiles=$(find packaging/tests/deployments/puppet/images/ -name "Dockerfile.*" | cut -d '.' -f2- | sort -u)
           if [ -z "$dockerfiles" ]; then
-            echo "Failed to get dockerfiles from internal/buildscripts/packaging/tests/deployments/puppet/images/!" >&2
+            echo "Failed to get dockerfiles from packaging/tests/deployments/puppet/images/!" >&2
             exit 1
           fi
           distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done)
@@ -124,7 +124,7 @@ jobs:
             tests="$distro and not instrumentation"
           fi
           python3 -u -m pytest -s --verbose -k "$tests" \
-            internal/buildscripts/packaging/tests/deployments/puppet/puppet_test.py
+            packaging/tests/deployments/puppet/puppet_test.py
 
       # qemu, networking, running systemd in containers, etc., can be flaky
       - name: Re-run failed tests
@@ -144,7 +144,7 @@ jobs:
           fi
           python3 -u -m pytest -s --verbose -k "$tests" \
             --last-failed \
-            internal/buildscripts/packaging/tests/deployments/puppet/puppet_test.py
+            packaging/tests/deployments/puppet/puppet_test.py
 
   puppet-test-windows:
     name: puppet-test-windows
@@ -184,7 +184,7 @@ jobs:
           if ($Env:WIN_COLLECTOR_VERSION -eq 'latest') { $Env:WIN_COLLECTOR_VERSION="$(curl -sS https://dl.signalfx.com/splunk-otel-collector/msi/release/latest.txt)" }
           pytest -s --verbose -m windows `
             -k ${{ matrix.TEST_CASE }} `
-            internal/buildscripts/packaging/tests/deployments/puppet/puppet_test.py
+            packaging/tests/deployments/puppet/puppet_test.py
 
       - name: Re-run failed tests
         if: ${{ steps.pytest.outcome == 'failure' }}
@@ -196,4 +196,4 @@ jobs:
           pytest -s --verbose -m windows `
             --last-failed `
             -k ${{ matrix.TEST_CASE }} `
-            internal/buildscripts/packaging/tests/deployments/puppet/puppet_test.py
+            packaging/tests/deployments/puppet/puppet_test.py
diff --git a/.github/workflows/release-requirements.yml b/.github/workflows/release-requirements.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - '.github/workflows/release-requirements.yml'
-      - 'internal/buildscripts/packaging/release/requirements.txt'
+      - 'packaging/release/requirements.txt'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -22,6 +22,6 @@ jobs:
         with:
           python-version: '3.9'
           cache: 'pip'
-          cache-dependency-path: 'internal/buildscripts/packaging/release/requirements.txt'
+          cache-dependency-path: 'packaging/release/requirements.txt'
 
-      - run: pip install -r internal/buildscripts/packaging/release/requirements.txt
+      - run: pip install -r packaging/release/requirements.txt