jenkinsfiles: remove unused environment variables #15125
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aanm
added
the
release-note/misc
aanm
added
release-note/ci
|
test-me-please |
|
hit #15141 |
nebril
requested changes
Mar 1, 2021
jenkinsfiles/ginkgo-gke.Jenkinsfile
Outdated
| @@ -83,6 +71,7 @@ pipeline { | |||
| } | |||
| if (env.RACE?.trim()) { | |||
There was a problem hiding this comment.
s/env.RACE?.trim()/env.run_with_race_detection?.trim() , RACE was set at line 23
| @@ -100,6 +88,7 @@ pipeline { | |||
| } | |||
| if (env.RACE?.trim()) { | |||
jenkinsfiles/ginkgo-gke.Jenkinsfile
Outdated
| @@ -83,6 +71,7 @@ pipeline { | |||
| } | |||
| if (env.RACE?.trim()) { | |||
| env.DOCKER_TAG = env.DOCKER_TAG + "-race" | |||
| env.RACE = "true" | |||
There was a problem hiding this comment.
This doesn't do anything, let's get rid of RACE env var in all jenkinsfiles aside from runtime.
| @@ -100,6 +88,7 @@ pipeline { | |||
| } | |||
| if (env.RACE?.trim()) { | |||
| env.DOCKER_TAG = env.DOCKER_TAG + "-race" | |||
| env.RACE = "true" | |||
| @@ -28,14 +28,6 @@ pipeline { | |||
| returnStdout: true, | |||
| script: 'if [ "${run_with_race_detection}" = "" ]; then echo -n ""; else echo -n "1"; fi' | |||
| )}""" | |||
| LOCKDEBUG="""${sh( | |||
There was a problem hiding this comment.
I think we want these env vars to be set, as they are passed to runtime VM which causes them to be passed to make targets run inside the vm which build the binaries.
| returnStdout: true, | ||
| script: 'if [ "${run_with_race_detection}" = "" ]; then echo -n ""; else echo -n "1"; fi' | ||
| )}""" | ||
| BASE_IMAGE="""${sh( |
| @@ -87,6 +75,7 @@ pipeline { | |||
| env.DOCKER_TAG = env.ghprbActualCommit | |||
| } else { | |||
| env.DOCKER_TAG = env.GIT_COMMIT | |||
| env.RACE = "true" | |||
There was a problem hiding this comment.
This is a no-op, we need a second if in this block:
if (env.run_with_race_detection?.trim()) {
env.DOCKER_TAG = env.DOCKER_TAG + "-race"
}
As we are no longer building images in ginkgo, we can remove these environment variables. Signed-off-by: André Martins <andre@cilium.io>
aanm
force-pushed
the
pr/remove-unused-fields-in-jenkins
branch
from
64d88d1
to
9ace2ea
Compare
nebril
approved these changes
Mar 1, 2021
|
test-me-please |
|
merging since this is only modifying jenkinsfiles. |
nbusseneau
added a commit
to nbusseneau/cilium
that referenced
this pull request
May 7, 2021
PR cilium#15125 broke race detector pipelines due to the `RACE` environment variable not being present, when it is required for `SkipRaceDetectorEnabled` to work properly. A quick inspection leads me to believe `LOCKDEBUG` also is required for package `lock`. I am less convinced about `BASE_IMAGE` being required, but I'm adding it back anyway in a sort of spiritual revert until we figure it out. Fixes cilium#15214: the Kafka tests were actually already disabled for race detector pipelines, as per cilium#13757. They were only running the pipelines due to cilium#15125 re-enabling them incidentally. Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
jrajahalme
pushed a commit
that referenced
this pull request
May 11, 2021
PR #15125 broke race detector pipelines due to the `RACE` environment variable not being present, when it is required for `SkipRaceDetectorEnabled` to work properly. A quick inspection leads me to believe `LOCKDEBUG` also is required for package `lock`. I am less convinced about `BASE_IMAGE` being required, but I'm adding it back anyway in a sort of spiritual revert until we figure it out. Fixes #15214: the Kafka tests were actually already disabled for race detector pipelines, as per #13757. They were only running the pipelines due to #15125 re-enabling them incidentally. Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
glibsm
pushed a commit
to glibsm/cilium
that referenced
this pull request
May 12, 2021
[ upstream commit f578ba5 ] PR cilium#15125 broke race detector pipelines due to the `RACE` environment variable not being present, when it is required for `SkipRaceDetectorEnabled` to work properly. A quick inspection leads me to believe `LOCKDEBUG` also is required for package `lock`. I am less convinced about `BASE_IMAGE` being required, but I'm adding it back anyway in a sort of spiritual revert until we figure it out. Fixes cilium#15214: the Kafka tests were actually already disabled for race detector pipelines, as per cilium#13757. They were only running the pipelines due to cilium#15125 re-enabling them incidentally. Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com> Signed-off-by: Glib Smaga <code@gsmaga.com>
aanm
pushed a commit
that referenced
this pull request
May 13, 2021
[ upstream commit f578ba5 ] PR #15125 broke race detector pipelines due to the `RACE` environment variable not being present, when it is required for `SkipRaceDetectorEnabled` to work properly. A quick inspection leads me to believe `LOCKDEBUG` also is required for package `lock`. I am less convinced about `BASE_IMAGE` being required, but I'm adding it back anyway in a sort of spiritual revert until we figure it out. Fixes #15214: the Kafka tests were actually already disabled for race detector pipelines, as per #13757. They were only running the pipelines due to #15125 re-enabling them incidentally. Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com> Signed-off-by: Glib Smaga <code@gsmaga.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As we are no longer building images in ginkgo, we can remove these
environment variables.
Signed-off-by: André Martins andre@cilium.io