Build version qualifier #8310
Build version qualifier #8310
Conversation
using the BEAT_VERSION_QUALIFIER environment variable
| @@ -98,6 +101,8 @@ func init() { | |||
| if err != nil { | |||
| panic(errors.Errorf("failed to parse SNAPSHOT env value", err)) | |||
| } | |||
|
|
|||
| versionQualifier, versionQualified = os.LookupEnv("BEAT_VERSION_QUALIFIER") | |||
There was a problem hiding this comment.
From what I understand versionQualified is always == versionQualifier != "". Would it make sense to remove that variable to avoid confusion?
There was a problem hiding this comment.
We can do that once the default build qualifier is empty. See the description where mage package produces a binary where the version subcommand is different than that produced by BEAT_VERSION_QUALIFIER= mage package.
There was a problem hiding this comment.
We could do that immediately if we update release manager first.
There was a problem hiding this comment.
Got it, thanks for the clarification
|
@andrewkroh FYI, I dropped my PR in favour of this, because we've got the requirements wrong. Can you review this one, please? |
| @@ -310,6 +317,20 @@ var ( | |||
| beatVersionOnce sync.Once | |||
| ) | |||
|
|
|||
| // BeatQualifiedVersion returns the Beat's qualified version. The value can be overwritten by | |||
| // setting BEAT_VERSION_QUALIFIER in the environment. | |||
There was a problem hiding this comment.
Think we should put BEAT_VERSION_QUALIFIER in the godocs for the release targets (duplicated in each magefile)?
filebeat akroh$ mage -h package
mage package:
Package packages the Beat for distribution.
Use SNAPSHOT=true to build snapshots.
Use PLATFORMS to control the target platforms.
There was a problem hiding this comment.
Great idea, I'll add that now.
per review feedback.
using the BEAT_VERSION_QUALIFIER environment variable.
This produces the expected packages:
default (on master)
alpha2
release (empty but set build qualifier)
README templates were already version aware, eg the
alpha2build produced:This change leaves a default embedded version qualifier
alpha1in place, to be removed when release manager is updated to pass one in.I propose we update kibana template versions with embedded
"version": "7.0.0-alpha1"separately.closes #8186