Skip to content

[DO NOT MERGE] Technical addon/orca fips #6043

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.

Sign up for GitHub

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

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
Draft

[DO NOT MERGE] Technical addon/orca fips #6043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
754477c
see if this is sufficient
hughesjj Mar 26, 2025
2c61167
update image name
hughesjj Mar 27, 2025
ef75038
comment out appinspect for testing
hughesjj Mar 27, 2025
2ee9d3d
re-enable tests
hughesjj Mar 27, 2025
202c62b
lol gitlab docs are wrong
hughesjj Mar 27, 2025
d8d4805
remove fips from collectd as this platform doesn't exist on k8s
hughesjj Mar 27, 2025
3aea932
recomment these, gotta change the script I guess
hughesjj Mar 27, 2025
642587a
think this properly does fips
hughesjj Mar 27, 2025
61fae3c
fix envvar name
hughesjj Mar 27, 2025
11bc7ac
fix quoting
hughesjj Mar 27, 2025
f3acd9b
cleanup
hughesjj Mar 27, 2025
f0b1374
swap branches
hughesjj Mar 27, 2025
18f23de
try a specific hash
hughesjj Mar 28, 2025
848babc
derp, wrong param
hughesjj Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 33 additions & 26 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,30 @@ agent-bundle-windows:
splunk_orca --cloud aws show deployments
fi
popd

.SPLUNK_LINUX_AWS_FIPS: &SPLUNK_LINUX_AWS_FIPS
UF_VERSION: ["10.0.0"]
SPLUNK_PLATFORM: ["x64_amazon_linux_2_fips"]
ORCA_CLOUD: ["aws"]
ORCA_OPTION: ['--env SPLUNK_LAUNCH_CONF="SPLUNK_FIPS=1"']
PLATFORM: ["linux"]
.SPLUNK_LINUX: &SPLUNK_LINUX
UF_VERSION: ["9.0.2", "8.2.7"]
SPLUNK_PLATFORM: ["x64_centos_7"]
ORCA_CLOUD: ["aws"]
ORCA_OPTION: ['--env SPLUNK_LAUNCH_CONF="SPLUNK_FIPS=0"']
PLATFORM: ["linux"]
.SPLUNK_WINDOWS_AWS_FIPS: &SPLUNK_WINDOWS_AWS_FIPS
UF_VERSION: ["10.0.0"]
SPLUNK_PLATFORM: ["x64_windows_2022_fips"]
ORCA_CLOUD: ["aws"]
ORCA_OPTION: ['--env SPLUNK_LAUNCH_CONF="SPLUNK_FIPS=1"']
PLATFORM: ["windows"]
.SPLUNK_WINDOWS: &SPLUNK_WINDOWS
UF_VERSION: ["9.0.2", "8.2.7"]
SPLUNK_PLATFORM: ["x64_windows_2019","x64_windows_2022"]
ORCA_CLOUD: ["aws"]
ORCA_OPTION: ['--env SPLUNK_LAUNCH_CONF="SPLUNK_FIPS=0"']
PLATFORM: ["windows"]
package-technical-addon:
image: "${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
stage: "package"
Expand All @@ -476,8 +499,6 @@ package-technical-addon:
artifacts:
paths:
- "$BUILD_DIR/out/distribution/Splunk_TA_otel*.tgz"
- "$BUILD_DIR/packaging-scripts"
- "$BUILD_DIR/Makefile"
parallel:
matrix:
- PLATFORM: ["all"]
Expand All @@ -490,16 +511,10 @@ test-happypath-ta:
- "package-technical-addon"
parallel:
matrix:
- UF_VERSION: ["9.0.2", "8.2.7"]
SPLUNK_PLATFORM: ["x64_centos_7"]
ORCA_CLOUD: ["aws"]
ORCA_OPTION: [""]
PLATFORM: ["linux"]
- UF_VERSION: ["9.0.2", "8.2.7"]
SPLUNK_PLATFORM: ["x64_windows_2019","x64_windows_2022" ]
ORCA_CLOUD: ["aws"]
ORCA_OPTION: [""]
PLATFORM: ["windows"]
- *SPLUNK_LINUX
- *SPLUNK_LINUX_AWS_FIPS
- *SPLUNK_WINDOWS
- *SPLUNK_WINDOWS_AWS_FIPS
script: |
make orca-test-ta -e
after_script:
Expand All @@ -512,7 +527,7 @@ test-happypath-ta:
paths:
- "$BUILD_DIR/out/**/*"
- "$BUILD_DIR/$CI_JOB_ID/**/*"
test-collectd-ta:
.test-collectd-ta:
image: "${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
extends: .auth-setup
stage: orca-tests
Expand All @@ -539,24 +554,16 @@ test-collectd-ta:
paths:
- "$BUILD_DIR/out/**/*"
- "$BUILD_DIR/$CI_JOB_ID/**/*"
test-gateway-ta:
.test-gateway-ta:
image: "${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
extends: .auth-setup
stage: orca-tests
dependencies:
- "package-technical-addon"
parallel:
matrix:
- UF_VERSION: ["9.0.2", "8.2.7"]
SPLUNK_PLATFORM: ["x64_centos_7"]
ORCA_CLOUD: ["aws"]
ORCA_OPTION: [""]
PLATFORM: ["linux"]
- UF_VERSION: ["9.0.2", "8.2.7"]
SPLUNK_PLATFORM: ["x64_windows_2019", "x64_windows_2022"]
ORCA_CLOUD: ["aws"]
ORCA_OPTION: [""]
PLATFORM: ["windows"]
- *SPLUNK_LINUX
- *SPLUNK_WINDOWS
script: |
make orca-gateway-test-ta -e
after_script:
Expand All @@ -571,7 +578,7 @@ test-gateway-ta:
paths:
- "$BUILD_DIR/out/**/*"
- "$BUILD_DIR/$CI_JOB_ID/**/*"
AppInspect_local:
.AppInspect_local:
image: "${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
dependencies:
- "package-technical-addon"
Expand Down
4 changes: 3 additions & 1 deletion packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ TEST_FOLDER="${TEST_FOLDER:-$BUILD_DIR/$CI_JOB_ID}"
mkdir -p "$TEST_FOLDER"

# Create ORCA container & grab id
splunk_orca -vvv --cloud "${ORCA_CLOUD}" --printer sdd-json --deployment-file "$TEST_FOLDER/orca_deployment.json" --ansible-log "$TEST_FOLDER/ansible-local.log" create --prefix "happypath" --env SPLUNK_CONNECTION_TIMEOUT=600 --platform "$SPLUNK_PLATFORM" --splunk-version "${UF_VERSION}" --local-apps "$TA_FULLPATH" --playbook "$SOURCE_DIR/packaging-scripts/orca-playbook-$PLATFORM.yml,site.yml"
SPLUNK_VERSION="$(echo "$SPLUNK_PLATFORM" | grep -qi "fips" && echo "--splunk-build 04cf955cd1c2ee2d7665da7409fc52fe86bacc5b" || echo "--splunk-version ${UF_VERSION}")"
# --platform x64_redhat_8_fips --splunk-image Splunk Orca Red Hat 9 FIPS (xxx) --splunk-branch develop
splunk_orca -vvv --cloud "${ORCA_CLOUD}" --printer sdd-json --deployment-file "$TEST_FOLDER/orca_deployment.json" --ansible-log "$TEST_FOLDER/ansible-local.log" create --prefix "happypath" --env SPLUNK_CONNECTION_TIMEOUT=600 --platform "$SPLUNK_PLATFORM" --local-apps "$TA_FULLPATH" --playbook "$SOURCE_DIR/packaging-scripts/orca-playbook-$PLATFORM.yml,site.yml" ${SPLUNK_VERSION} ${ORCA_OPTION}
deployment_id="$(jq -r '.orca_deployment_id' < "$TEST_FOLDER/orca_deployment.json")"
ip_addr="$(jq -r '.server_roles.standalone[0].host' < "$TEST_FOLDER/orca_deployment.json")"

Expand Down