Skip to content

Commit 85c8da2

Browse files
mowiesAkhigbeEromo
authored andcommitted
[chore] remove linux package builds and tests (open-telemetry#34372)
This PR removes the package tests from this repo since they were moved to the -releases repo in open-telemetry/opentelemetry-collector-releases#604. Related issues: - Original issue: open-telemetry/opentelemetry-collector-releases#439 - Also fixes open-telemetry#34748 Advantages of doing this: - removal of duplicated code that has potential to diverge with linux package building and testing happening here with custom code, but the actual code that is used to build the released linux packages is in the -releases repo. This should result in lower maintenance effort and removes technical debt. Disadvantages discussed here: - bit of a shift-right for the linux package tests since they are now tested in the -releases repo which could lead to situations where bugs are found too late and e.g. the contrib repo already got a new tag which has a bug that only comes up in the releases repo --------- Signed-off-by: Moritz Wiesinger <[email protected]>
1 parent 7167c1d commit 85c8da2

File tree

16 files changed

+3
-426
lines changed

16 files changed

+3
-426
lines changed

.github/workflows/build-and-test.yml

Lines changed: 3 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -528,57 +528,9 @@ jobs:
528528
name: collector-binaries-${{ matrix.os }}-${{ matrix.arch }}
529529
path: ./bin/*
530530

531-
build-package:
532-
runs-on: ubuntu-latest
533-
needs: [cross-compile]
534-
strategy:
535-
fail-fast: false
536-
matrix:
537-
package_type: ["deb", "rpm"]
538-
steps:
539-
- uses: actions/checkout@v4
540-
with:
541-
fetch-depth: 0
542-
- name: Install Ruby
543-
uses: ruby/setup-ruby@v1
544-
with:
545-
ruby-version: "3.3"
546-
- name: Install fpm
547-
run: gem install --no-document fpm -v 1.15.1
548-
- name: Download Collector Binaries
549-
uses: actions/download-artifact@v4
550-
with:
551-
merge-multiple: true
552-
path: bin/
553-
pattern: collector-binaries-*
554-
- run: chmod +x bin/*
555-
- name: Set Release Tag
556-
id: github_tag
557-
run: ./.github/workflows/scripts/set_release_tag.sh
558-
- name: Build ${{ matrix.package_type }} amd64 package
559-
run: ./internal/buildscripts/packaging/fpm/${{ matrix.package_type }}/build.sh "${{ steps.github_tag.outputs.tag }}" "amd64" "./dist/"
560-
- name: Build ${{ matrix.package_type }} arm64 package
561-
run: ./internal/buildscripts/packaging/fpm/${{ matrix.package_type }}/build.sh "${{ steps.github_tag.outputs.tag }}" "arm64" "./dist/"
562-
- name: Build ${{ matrix.package_type }} ppc64le package
563-
run: ./internal/buildscripts/packaging/fpm/${{ matrix.package_type }}/build.sh "${{ steps.github_tag.outputs.tag }}" "ppc64le" "./dist/"
564-
- name: Build ${{ matrix.package_type }} s390x package
565-
run: ./internal/buildscripts/packaging/fpm/${{ matrix.package_type }}/build.sh "${{ steps.github_tag.outputs.tag }}" "s390x" "./dist/"
566-
- name: Test ${{ matrix.package_type }} package
567-
run: |
568-
if [[ "${{ matrix.package_type }}" = "deb" ]]; then
569-
./internal/buildscripts/packaging/fpm/test.sh dist/otel-contrib-collector*amd64.deb examples/demo/otel-collector-config.yaml
570-
else
571-
./internal/buildscripts/packaging/fpm/test.sh dist/otel-contrib-collector*x86_64.rpm examples/demo/otel-collector-config.yaml
572-
fi
573-
- name: Upload Packages
574-
uses: actions/upload-artifact@v4
575-
with:
576-
name: collector-packages-${{ matrix.package_type }}
577-
path: ./dist/*
578-
579531
publish-check:
580532
runs-on: ubuntu-latest
581-
needs: [lint, unittest, integration-tests, build-package]
533+
needs: [lint, unittest, integration-tests]
582534
steps:
583535
- uses: actions/checkout@v4
584536
- name: Download Binaries
@@ -587,18 +539,12 @@ jobs:
587539
merge-multiple: true
588540
path: ./bin/
589541
pattern: collector-binaries-*
590-
- name: Download Packages
591-
uses: actions/download-artifact@v4
592-
with:
593-
merge-multiple: true
594-
path: ./dist/
595-
pattern: collector-packages-*
596542
- name: Verify Distribution Files Exist
597543
id: check
598544
run: ./.github/workflows/scripts/verify-dist-files-exist.sh
599545
publish-dev:
600546
runs-on: ubuntu-latest
601-
needs: [lint, unittest, integration-tests, build-package]
547+
needs: [lint, unittest, integration-tests]
602548
if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) && github.repository == 'open-telemetry/opentelemetry-collector-contrib'
603549
steps:
604550
- uses: actions/checkout@v4
@@ -631,12 +577,6 @@ jobs:
631577
path: ./bin/
632578
pattern: collector-binaries-*
633579
- run: chmod +x bin/*
634-
- name: Download Packages
635-
uses: actions/download-artifact@v4
636-
with:
637-
merge-multiple: true
638-
path: ./dist/
639-
pattern: collector-packages-*
640580
- name: Add Permissions to Tool Binaries
641581
run: chmod -R +x ./dist
642582
- name: Verify Distribution Files Exist
@@ -665,7 +605,7 @@ jobs:
665605
docker push otel/opentelemetry-collector-contrib-dev:latest
666606
publish-stable:
667607
runs-on: ubuntu-latest
668-
needs: [lint, unittest, integration-tests, build-package]
608+
needs: [lint, unittest, integration-tests]
669609
if: startsWith(github.ref, 'refs/tags/v') && github.repository == 'open-telemetry/opentelemetry-collector-contrib'
670610
steps:
671611
- uses: actions/checkout@v4

.github/workflows/scripts/verify-dist-files-exist.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@ files=(
1111
bin/otelcontribcol_linux_amd64
1212
bin/otelcontribcol_linux_s390x
1313
bin/otelcontribcol_windows_amd64.exe
14-
dist/otel-contrib-collector-*.aarch64.rpm
15-
dist/otel-contrib-collector_*_amd64.deb
16-
dist/otel-contrib-collector-*.x86_64.rpm
17-
dist/otel-contrib-collector_*_arm64.deb
18-
dist/otel-contrib-collector-*.ppc64le.rpm
19-
dist/otel-contrib-collector_*_ppc64le.deb
20-
dist/otel-contrib-collector_*_s390x.deb
21-
dist/otel-contrib-collector-*.s390x.rpm
2214
# skip. See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/10113
2315
# dist/otel-contrib-collector-*amd64.msi
2416

internal/buildscripts/packaging/fpm/Dockerfile

Lines changed: 0 additions & 16 deletions
This file was deleted.

internal/buildscripts/packaging/fpm/common.sh

Lines changed: 0 additions & 66 deletions
This file was deleted.

internal/buildscripts/packaging/fpm/deb/Dockerfile.test

Lines changed: 0 additions & 14 deletions
This file was deleted.

internal/buildscripts/packaging/fpm/deb/README.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

internal/buildscripts/packaging/fpm/deb/build.sh

Lines changed: 0 additions & 40 deletions
This file was deleted.

internal/buildscripts/packaging/fpm/otel-contrib-collector.conf

Lines changed: 0 additions & 5 deletions
This file was deleted.

internal/buildscripts/packaging/fpm/otel-contrib-collector.service

Lines changed: 0 additions & 15 deletions
This file was deleted.

internal/buildscripts/packaging/fpm/postinstall.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)