Skip to content
This repository was archived by the owner on Jan 23, 2024. It is now read-only.

Conversation

@gregkalapos
Copy link
Contributor

Bump .NET version to .NET6

What does this PR do?

In the main agent repo, I'm updating the code base to build and test on .NET 6. This PR updates the docker file where we build the agent as well.

Why is it important?

Otherwise we can't build the tests.

Related issues

PR in the .NET agent repo: elastic/apm-agent-dotnet#1605

Bump .NET version to .NET6
@ghost
Copy link

ghost commented Jan 25, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Reason: null

  • Start Time: 2022-01-26T20:13:22.397+0000

  • Duration: 47 min 0 sec

  • Commit: eb36e2b

Test stats 🧪

Test Results
Failed 0
Passed 707
Skipped 1
Total 708

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@gregkalapos gregkalapos marked this pull request as ready for review January 26, 2022 17:26
@gregkalapos gregkalapos requested a review from a team January 26, 2022 17:27
@gregkalapos
Copy link
Contributor Author

I see strange failures, but that does not seem to be related to the PR - it does not get to the stage where we'd use the updated docker file. Could someone please help out?

@v1v
Copy link
Member

v1v commented Jan 26, 2022

As far as I see the docker image for the dotnet service failed to be built:

[2022-01-25T19:11:02.510Z] ERROR: for agent-dotnet  (<Service: agent-dotnet>, "The command '/bin/sh -c ./run.sh' returned a non-zero code: 145")
[2022-01-25T19:11:02.510Z] Service 'agent-dotnet' failed to build : The command '/bin/sh -c ./run.sh' returned a non-zero code: 145

https://apm-ci.elastic.co/blue/organizations/jenkins/apm-integration-test-downstream/detail/PR-1412/1/pipeline#step-111-log-704

Can you run the below command locally?

ELASTIC_STACK_VERSION=8.1.0 BUILD_OPTS="--apm-log-level=debug  --build-parallel" .ci/scripts/build-docker-all.sh

@gregkalapos
Copy link
Contributor Author

Found it, this was the issue:

[2022-01-25T19:11:31.507Z] + dotnet sln remove sample/AspNetFullFrameworkSampleApp/AspNetFullFrameworkSampleApp.csproj
[2022-01-25T19:11:31.507Z] Could not execute because the application was not found or a compatible .NET SDK is not installed.
[2022-01-25T19:11:31.507Z] Possible reasons for this include:
[2022-01-25T19:11:31.507Z]   * You intended to execute a .NET program:
[2022-01-25T19:11:31.507Z]       The application 'sln' does not exist.
[2022-01-25T19:11:31.507Z]   * You intended to execute a .NET SDK command:
[2022-01-25T19:11:31.507Z]       A compatible installed .NET SDK for global.json version [5.0.100] from [/src/dotnet-agent/global.json] was not found.
[2022-01-25T19:11:31.507Z]       Install the [5.0.100] .NET SDK or update [/src/dotnet-agent/global.json] with an installed .NET SDK:
[2022-01-25T19:11:31.507Z]         3.1.100 [/usr/share/dotnet/sdk]
[2022-01-25T19:11:31.507Z]         6.0.101 [/usr/share/dotnet/sdk]

Pushed a fix, it's green now. Ready for review.

@v1v
Copy link
Member

v1v commented Jan 26, 2022

@Mergifyio backport 5.x

@mergify
Copy link
Contributor

mergify bot commented Jan 26, 2022

backport 5.x

🟠 Waiting for conditions to match

  • merged [:pushpin: backport requirement]

@gregkalapos gregkalapos merged commit 5b2ed7a into elastic:main Jan 26, 2022
@gregkalapos gregkalapos deleted the UpdateToDotNet6 branch January 26, 2022 21:10
mergify bot pushed a commit that referenced this pull request Jan 26, 2022
* Update Dockerfile

Bump .NET version to .NET6

* Update Dockerfile

(cherry picked from commit 5b2ed7a)
@mergify
Copy link
Contributor

mergify bot commented Jan 26, 2022

backport 5.x

✅ Backports have been created

@v1v
Copy link
Member

v1v commented Jan 26, 2022

@Mergifyio backport 5.x

mergify bot pushed a commit that referenced this pull request Jan 26, 2022
* Update Dockerfile

Bump .NET version to .NET6

* Update Dockerfile

(cherry picked from commit 5b2ed7a)
@mergify
Copy link
Contributor

mergify bot commented Jan 26, 2022

backport 5.x

✅ Backports have been created

v1v pushed a commit that referenced this pull request Jan 27, 2022
* Update Dockerfile

Bump .NET version to .NET6

* Update Dockerfile

(cherry picked from commit 5b2ed7a)

Co-authored-by: Gergely Kalapos <[email protected]>
v1v pushed a commit that referenced this pull request Jan 27, 2022
* Update Dockerfile

Bump .NET version to .NET6

* Update Dockerfile

(cherry picked from commit 5b2ed7a)

Co-authored-by: Gergely Kalapos <[email protected]>
v1v added a commit to v1v/apm-integration-testing that referenced this pull request Feb 3, 2022
…main-reference

* upstream/main:
  Update dockerfile for opbeans-dotnet to use .NET6 (elastic#1423)
  versions: wrong versions (elastic#1414)
  Update dockerfile for .NET test to use .NET6 (elastic#1412)
  apm: Neutral naming for apm-agent-java (elastic#1375)
  docker/go: use go.elastic.co/apm/v2 (elastic#1403)
  docker/opbeans/go: strip vN from replacement path (elastic#1401)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants