Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] move package tests from contrib repo to this repo #604

Merged
merged 6 commits into from
Jul 31, 2024

Conversation

mowies
Copy link
Member

@mowies mowies commented Jul 18, 2024

This PR

Testing

I tested the new pipelines on my fork's main branch. Fully working runs with the setup from this PR can be seen here:
Core pipeline, Contrib pipeline

Notes

  • The package-tests.sh and common.sh together with the test dockerfiles were copied over and slightly adjusted where needed.
  • I didn't add a test setup for the .apk package version since that was also not present in the other repo and I didn't want to increase the size of this PR with additional new stuff. That part could be a follow up issue.

Testing

I merged this PR into my forked main branch and the pipelines fully work there.
Links to the pipeline runs: Core pipeline, Contrib pipeline

Follow ups

Remove package tests from contrib repo

@mowies mowies changed the title move package tests from contrib repo chore: move package tests from contrib repo to this repo Jul 23, 2024
@mowies mowies changed the title chore: move package tests from contrib repo to this repo [chore] move package tests from contrib repo to this repo Jul 23, 2024
@mowies mowies marked this pull request as ready for review July 24, 2024 14:14
@mowies mowies requested review from a team and songy23 July 24, 2024 14:14
.github/workflows/base-ci-goreleaser.yaml Outdated Show resolved Hide resolved
.goreleaser.yaml Show resolved Hide resolved
@mowies
Copy link
Member Author

mowies commented Jul 25, 2024

@mx-psi I separated out the changes you requested and will rebase this PR once those are merged to bring it up to date again.
Here are the links: #609, #610

@mx-psi
Copy link
Member

mx-psi commented Jul 25, 2024

Thanks!

Signed-off-by: Moritz Wiesinger <[email protected]>

add shellcheck option to follow other files

Signed-off-by: Moritz Wiesinger <[email protected]>

use shellcheck directive

Signed-off-by: Moritz Wiesinger <[email protected]>

make shellcheck happy

Signed-off-by: Moritz Wiesinger <[email protected]>

fix shellcheck things

Signed-off-by: Moritz Wiesinger <[email protected]>

move dockerfiles, remove unneeded files

Signed-off-by: Moritz Wiesinger <[email protected]>

also test rpm package

Signed-off-by: Moritz Wiesinger <[email protected]>

add missing variable

Signed-off-by: Moritz Wiesinger <[email protected]>

only build linux amd64 for now

Signed-off-by: Moritz Wiesinger <[email protected]>

only build linux amd64 for now

Signed-off-by: Moritz Wiesinger <[email protected]>

fix service unit name

Signed-off-by: Moritz Wiesinger <[email protected]>

add missing files

Signed-off-by: Moritz Wiesinger <[email protected]>

remove unneeded variables and files

Signed-off-by: Moritz Wiesinger <[email protected]>

add checkout step

Signed-off-by: Moritz Wiesinger <[email protected]>

fix if conditionals

Signed-off-by: Moritz Wiesinger <[email protected]>

add demo config, add script run

Signed-off-by: Moritz Wiesinger <[email protected]>

copy over package test scripts

Signed-off-by: Moritz Wiesinger <[email protected]>

add job dependency

Signed-off-by: Moritz Wiesinger <[email protected]>

move package test steps for testing

Signed-off-by: Moritz Wiesinger <[email protected]>

revert goreleaser change

Signed-off-by: Moritz Wiesinger <[email protected]>

fix if statement

Signed-off-by: Moritz Wiesinger <[email protected]>

test commit

Signed-off-by: Moritz Wiesinger <[email protected]>

run package tests as part of core ci workflow

Signed-off-by: Moritz Wiesinger <[email protected]>

download artifacts in new workflow

Signed-off-by: Moritz Wiesinger <[email protected]>

defuse package tests for now

Signed-off-by: Moritz Wiesinger <[email protected]>

upload linux/amd64 service packages after building a snapshot

Signed-off-by: Moritz Wiesinger <[email protected]>

update goreleaser-pro to latest version, add version field to config files to remove warning

Signed-off-by: Moritz Wiesinger <[email protected]>

add package test workflow

Signed-off-by: Moritz Wiesinger <[email protected]>
Signed-off-by: Moritz Wiesinger <[email protected]>
@mowies
Copy link
Member Author

mowies commented Jul 30, 2024

@mx-psi both #609 and #610 are merged now and I rebased this PR.
should be ready for review again :)

scripts/package-tests/Dockerfile.test.deb Outdated Show resolved Hide resolved
scripts/package-tests/Dockerfile.test.rpm Outdated Show resolved Hide resolved
scripts/package-tests/README.md Outdated Show resolved Hide resolved
scripts/package-tests/README.md Outdated Show resolved Hide resolved
scripts/package-tests/README.md Outdated Show resolved Hide resolved
scripts/package-tests/README.md Outdated Show resolved Hide resolved
mowies and others added 3 commits July 30, 2024 14:38
Co-authored-by: Pablo Baeyens <[email protected]>
Co-authored-by: Pablo Baeyens <[email protected]>
Signed-off-by: Moritz Wiesinger <[email protected]>
Copy link
Member

@mx-psi mx-psi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@mx-psi
Copy link
Member

mx-psi commented Jul 31, 2024

I am going to wait to merge this until after v0.106.1 is released

andrzej-stencel pushed a commit to open-telemetry/opentelemetry-collector-contrib that referenced this pull request Oct 3, 2024
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
#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]>
jriguera pushed a commit to springernature/opentelemetry-collector-contrib that referenced this pull request Oct 4, 2024
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]>
Eromosele-SM pushed a commit to sematext/opentelemetry-collector-contrib that referenced this pull request Oct 9, 2024
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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move package testing to this repository
2 participants