-
Notifications
You must be signed in to change notification settings - Fork 159
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
Adopts the orca testing into the releaser pipeline CI/CD. #5867
Conversation
584780e
to
ba32432
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mostly just nits and questions. I'm not very familiar with the functionality here unfortunately, so I wasn't able to give much good feedback there.
.gitlab-ci.yml
Outdated
pip install --upgrade pip | ||
pip install --upgrade splunk-orca | ||
splunk_orca --help | ||
cd ~ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: I'd be slightly more comfortable with pushd
/popd
vs. cd ~
and cd -
, in the case of future changes potentially adding more cd
commands.
.gitlab-ci.yml
Outdated
parallel: | ||
matrix: | ||
- PLATFORM: ["all"] | ||
ARCH: ["amd64"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a known limitation here around arm
? If not, should we add testing for it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The docs don't show support for non "intel" (x86 & amd64) architectures, but I've heard the UF can run on arm. So, for now, we're only actually vending amd64, but the build infra is in place to do builds for arm whenever for we get more clarity or a customer asking for an alpha.
I'm not opposed to removing this, only kept it in there because we use ARCH in our build scripts everywhere else and the work was already done.
packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh
Outdated
Show resolved
Hide resolved
packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh
Outdated
Show resolved
Hide resolved
packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh
Outdated
Show resolved
Hide resolved
packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh
Outdated
Show resolved
Hide resolved
# Ensure version is as expected | ||
actual_version="$(grep "Version" "$TEST_FOLDER/splunk/otel.log" | head -1 | awk -F 'Version": "' '{print $2}' | awk -F '", "' '{print $1}')" | ||
echo "actual version: $actual_version" | ||
[[ "$actual_version" != "v0.111.0" ]] && echo "Test failed -- invalid version" && exit 1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we eventually have this be a more central variable for expected version? Should we document somewhere that this should be updated for every new TA release?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added a comment -- now that this is getting "inlined", hope is that we can introspect against the commit tag (if present) and make sure it's the same as v0.XXX.0
or whatever version is set.
This needs to be out though so holding off on the myriad of improvements I'd like us to have.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nothing of much value from my review, mostly Qs...
set "SPLUNK_OTEL_FLAGS=" | ||
|
||
|
||
:: BEGIN AUTOGENERATED CODE |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this really autogenerated?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
from a crappy python script we're getting rid of, yes. Idea is to move this to some STDIN input for all the autogenerated stuff.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So, I suppose more "generated"
set "SPLUNK_OTEL_FLAGS=" | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: remove one blank line
packaging/technical-addon/Splunk_TA_otel/windows_x86_64/bin/Splunk_TA_otel.cmd
Show resolved
Hide resolved
packaging/technical-addon/Splunk_TA_otel/windows_x86_64/bin/Splunk_TA_otel.cmd
Show resolved
Hide resolved
@@ -377,15 +363,22 @@ for /f "delims=" %%i in ('powershell -noninteractive -noprofile -command "'%disc | |||
for /f "delims=" %%i in ('powershell -noninteractive -noprofile -command "'%discovery_properties_value%' -replace '\$SPLUNK_HOME', '%SPLUNK_HOME%'"') do ( | |||
set "discovery_properties_value=%%i" | |||
) | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: delete extra blank line
ip_addr="$(jq -r '.server_roles.standalone[0].host' < "$TEST_FOLDER/orca_deployment.json")" | ||
|
||
if [ "$PLATFORM" == "windows" ]; then | ||
# Windows takes forever to extract |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
side Q.: do you know how the extraction is done on Windows?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It uses the powershell Expand-Archive
command
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It may go faster with progress bar is disabled.
packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh
Show resolved
Hide resolved
Significant fixes and some reorganization. The gateway and collectd tests will reappear in separate PRs in order to keep cognitive load down on this one. Signed-off-by: James Hughes <jameshughes@splunk.com>
ba32432
to
748729d
Compare
…th-test.sh Co-authored-by: Curtis Robert <crobert@splunk.com>
Adopts the orca testing into the releaser pipeline CI/CD.
Significant fixes and some reorganization. The gateway and collectd tests will reappear in separate PRs in order to keep cognitive load down on this one.