Skip to content

Commit 250c38b

Browse files
authored
[chore] remove orca-tests stage (#7257)
* [chore] remove orca-tests stage * remove unused orca files
1 parent 6dc91d0 commit 250c38b

File tree

12 files changed

+1
-565
lines changed

12 files changed

+1
-565
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ stages:
3636
- release
3737
- docker-manifest-release
3838
- xray-scan
39-
- orca-tests
4039
- publish-release
4140

4241
include:
@@ -538,46 +537,6 @@ agent-bundle-windows:
538537
when: always
539538
- if: $CI_COMMIT_BRANCH != "main" && $CI_COMMIT_TAG == null && $CI_COMMIT_REF_PROTECTED == 'true'
540539
when: manual
541-
.auth-setup:
542-
id_tokens:
543-
CI_JOB_JWT:
544-
aud:
545-
- "$CICD_VAULT_ADDR"
546-
- "$SECRETS_URL"
547-
variables:
548-
TEST_FOLDER: $BUILD_DIR/$CI_JOB_ID
549-
after_script:
550-
- splunk_orca -v destroy --labels gitlab.job_url=${CI_JOB_URL} || true
551-
- splunk_orca -v --cloud aws destroy --labels gitlab.job_url=${CI_JOB_URL} || true
552-
- creds-helper logout --silent=false
553-
before_script: |
554-
creds-helper init
555-
creds-helper pypi "$PYPI_READER_ROLE"
556-
eval "$(creds-helper artifactory --eval "$PYPI_READER_ROLE" )"
557-
pip install --upgrade pip
558-
pip install --upgrade splunk-orca
559-
splunk_orca --help
560-
eval "$(creds-helper artifactory --eval "$GENERIC_RELEASER_ROLE_URI" )"
561-
eval "$(creds-helper aws --eval "aws:v1/o11y-infra/role/o11y_gdi_otel_releaser_role" )"
562-
# extract orca config (honestly we could probably just set this up every time)
563-
pushd ~
564-
if [ "$SPLUNK_CLOUD" == "kubernetes" ]; then
565-
echo ${NEW_ORCA_TGZ} | base64 -d > orca_cred.tar.gz
566-
tar -xzvf ~/orca_cred.tar.gz
567-
# Also set some aws auth
568-
grep aws_secret_access_key "$AWS_SHARED_CREDENTIALS_FILE" >> ~/.orca/orca.conf
569-
grep aws_access_key_id "$AWS_SHARED_CREDENTIALS_FILE" >> ~/.orca/orca.conf
570-
grep aws_session_token "$AWS_SHARED_CREDENTIALS_FILE" >> ~/.orca/orca.conf
571-
# Test access
572-
splunk_orca --cloud kubernetes show deployments
573-
else
574-
echo ${ORCA_TAR_GZ} | base64 -d > orca_cred.tar.gz
575-
tar -xzvf ~/orca_cred.tar.gz
576-
# Test access
577-
splunk_orca --cloud aws show deployments
578-
fi
579-
popd
580-
581540
package-technical-addon:
582541
extends:
583542
- .collector-ta-trigger
@@ -595,113 +554,6 @@ package-technical-addon:
595554
matrix:
596555
- PLATFORM: ["all"]
597556

598-
test-happypath-ta:
599-
image: "${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
600-
extends:
601-
- .collector-ta-trigger
602-
- .auth-setup
603-
stage: "orca-tests"
604-
needs:
605-
- "package-technical-addon"
606-
dependencies:
607-
- "package-technical-addon"
608-
parallel:
609-
matrix:
610-
- UF_VERSION: ["9.0.2", "8.2.7"]
611-
SPLUNK_PLATFORM: ["x64_centos_7"]
612-
ORCA_CLOUD: ["aws"]
613-
ORCA_OPTION: [""]
614-
PLATFORM: ["linux"]
615-
- UF_VERSION: ["9.0.2", "8.2.7"]
616-
SPLUNK_PLATFORM: ["x64_windows_2019","x64_windows_2022" ]
617-
ORCA_CLOUD: ["aws"]
618-
ORCA_OPTION: [""]
619-
PLATFORM: ["windows"]
620-
script: |
621-
cd "${ADDONS_SOURCE_DIR}"
622-
make orca-test-ta -e
623-
after_script:
624-
# spin down orca deployments
625-
- "cd ${CI_PROJECT_DIR}"
626-
- deployment_id=$(grep "orca_deployment_id" $TEST_FOLDER/orca_deployment.json | awk -F ':' '{print $2}' | awk -F '"' '{print $2}')
627-
- splunk_orca --cloud ${ORCA_CLOUD} destroy "${deployment_id}"
628-
artifacts:
629-
when: always
630-
paths:
631-
- "$BUILD_DIR/out/**/*"
632-
- "$BUILD_DIR/$CI_JOB_ID/**/*"
633-
allow_failure: true
634-
test-collectd-ta:
635-
image: "${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
636-
extends:
637-
- .collector-ta-trigger
638-
- .auth-setup
639-
stage: orca-tests
640-
variables:
641-
ORCA_TAR_GZ: "$NEW_ORCA_TGZ"
642-
needs:
643-
- "package-technical-addon"
644-
dependencies:
645-
- "package-technical-addon"
646-
parallel:
647-
matrix:
648-
- UF_VERSION: ["9.0.2", "8.2.7"]
649-
SPLUNK_PLATFORM: ["x64_centos_7"]
650-
ORCA_CLOUD: ["kubernetes"]
651-
ORCA_OPTION: ["--exec-user root"]
652-
PLATFORM: ["linux"]
653-
script: |
654-
cd "${ADDONS_SOURCE_DIR}"
655-
make orca-collectd-test-ta -e
656-
after_script:
657-
# spin down orca deployments
658-
- "cd ${CI_PROJECT_DIR}"
659-
- deployment_id=$(grep "orca_deployment_id" $TEST_FOLDER/orca_deployment.json | awk -F ':' '{print $2}' | awk -F '"' '{print $2}')
660-
- splunk_orca --cloud ${ORCA_CLOUD} destroy "${deployment_id}"
661-
artifacts:
662-
when: always
663-
paths:
664-
- "$BUILD_DIR/out/**/*"
665-
- "$BUILD_DIR/$CI_JOB_ID/**/*"
666-
allow_failure: true
667-
test-gateway-ta:
668-
image: "${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
669-
extends:
670-
- .collector-ta-trigger
671-
- .auth-setup
672-
stage: orca-tests
673-
needs:
674-
- "package-technical-addon"
675-
dependencies:
676-
- "package-technical-addon"
677-
parallel:
678-
matrix:
679-
- UF_VERSION: ["9.0.2", "8.2.7"]
680-
SPLUNK_PLATFORM: ["x64_centos_7"]
681-
ORCA_CLOUD: ["aws"]
682-
ORCA_OPTION: [""]
683-
PLATFORM: ["linux"]
684-
- UF_VERSION: ["9.0.2", "8.2.7"]
685-
SPLUNK_PLATFORM: ["x64_windows_2019", "x64_windows_2022"]
686-
ORCA_CLOUD: ["aws"]
687-
ORCA_OPTION: [""]
688-
PLATFORM: ["windows"]
689-
script: |
690-
cd "${ADDONS_SOURCE_DIR}"
691-
make orca-gateway-test-ta -e
692-
after_script:
693-
# spin down orca deployments
694-
- "cd ${CI_PROJECT_DIR}"
695-
- gateway_deployment_id=$(grep "orca_deployment_id" $TEST_FOLDER/orca-gateway-deployment.json | awk -F ':' '{print $2}' | awk -F '"' '{print $2}')
696-
- splunk_orca --cloud ${ORCA_CLOUD} destroy "${gateway_deployment_id}"
697-
- gateway_agent_deployment_id=$(grep "orca_deployment_id" $TEST_FOLDER/orca-gateway-agent-deployment.json | awk -F ':' '{print $2}' | awk -F '"' '{print $2}')
698-
- splunk_orca --cloud ${ORCA_CLOUD} destroy "${gateway_agent_deployment_id}"
699-
artifacts:
700-
when: always
701-
paths:
702-
- "$BUILD_DIR/out/**/*"
703-
- "$BUILD_DIR/$CI_JOB_ID/**/*"
704-
allow_failure: true
705557
AppInspect_local:
706558
extends:
707559
- .collector-ta-trigger
@@ -734,9 +586,6 @@ collector-ta-release:
734586
stage: publish-release
735587
dependencies:
736588
- package-technical-addon
737-
- test-happypath-ta
738-
- test-collectd-ta
739-
- test-gateway-ta
740589
script:
741590
- |
742591
cd "${ADDONS_SOURCE_DIR}"

packaging/technical-addon/Makefile

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ ARCH?=amd64
1111
# include autoinstrumentation
1212
AUTOINSTRUMENTATION_DIR:=$(SRC_ROOT)/instrumentation
1313

14-
# Used for testing & validation
15-
ORCA_CLOUD?=kubernetes
16-
UF_VERSION?=8.2.7
17-
SPLUNK_PLATFORM?=x64_centos_7
1814
SPLUNK_ARCH?=x86_64
1915

2016
# Used for releases
@@ -146,12 +142,6 @@ env-guard-ta: env-guard-all
146142
$(ADDONS_SOURCE_DIR)/packaging-scripts/env/ta.sh
147143

148144

149-
.PHONY: env-guard-verify
150-
env-guard-verify: env-guard-ta
151-
ORCA_CLOUD="$(ORCA_CLOUD)" \
152-
UF_VERSION="$(UF_VERSION)" \
153-
$(ADDONS_SOURCE_DIR)/packaging-scripts/env/verify.sh
154-
155145
.PHONY: download-release
156146
download-release: env-guard-ta
157147
BUILD_DIR="$(BUILD_DIR)" \
@@ -183,44 +173,6 @@ package-ta: env-guard-ta
183173
.PHONY: distribute-ta
184174
distribute-ta: generate-technical-addon download-release package-ta
185175

186-
.PHONY: orca-test-ta
187-
orca-test-ta: env-guard-verify
188-
ADDONS_SOURCE_DIR="$(ADDONS_SOURCE_DIR)" \
189-
BUILD_DIR="$(BUILD_DIR)" \
190-
ARCH="$(ARCH)" \
191-
PLATFORM="$(PLATFORM)" \
192-
OTEL_COLLECTOR_VERSION="$(OTEL_COLLECTOR_VERSION)" \
193-
ORCA_CLOUD="$(ORCA_CLOUD)" \
194-
UF_VERSION="$(UF_VERSION)" \
195-
SPLUNK_PLATFORM="$(SPLUNK_PLATFORM)" \
196-
OLLY_ACCESS_TOKEN="$(OLLY_ACCESS_TOKEN)" \
197-
$(ADDONS_SOURCE_DIR)/packaging-scripts/cicd-tests/happypath-test.sh
198-
199-
.PHONY: orca-test-ta
200-
orca-collectd-test-ta: env-guard-verify
201-
ADDONS_SOURCE_DIR="$(ADDONS_SOURCE_DIR)" \
202-
BUILD_DIR="$(BUILD_DIR)" \
203-
ARCH="$(ARCH)" \
204-
PLATFORM="$(PLATFORM)" \
205-
OTEL_COLLECTOR_VERSION="$(OTEL_COLLECTOR_VERSION)" \
206-
ORCA_CLOUD="$(ORCA_CLOUD)" \
207-
UF_VERSION="$(UF_VERSION)" \
208-
SPLUNK_PLATFORM="$(SPLUNK_PLATFORM)" \
209-
OLLY_ACCESS_TOKEN="$(OLLY_ACCESS_TOKEN)" \
210-
$(ADDONS_SOURCE_DIR)/packaging-scripts/cicd-tests/agent-bundle/orca-collectd-test.sh
211-
212-
.PHONY: orca-gateway-test-ta
213-
orca-gateway-test-ta: env-guard-verify
214-
ADDONS_SOURCE_DIR="$(ADDONS_SOURCE_DIR)" \
215-
BUILD_DIR="$(BUILD_DIR)" \
216-
ARCH="$(ARCH)" \
217-
SPLUNK_PLATFORM="$(SPLUNK_PLATFORM)" \
218-
PLATFORM="$(PLATFORM)" \
219-
ORCA_CLOUD="$(ORCA_CLOUD)" \
220-
UF_VERSION="$(UF_VERSION)" \
221-
OLLY_ACCESS_TOKEN="$(OLLY_ACCESS_TOKEN)" \
222-
$(ADDONS_SOURCE_DIR)/packaging-scripts/cicd-tests/gateway/gateway.sh
223-
224176
.PHONY: smoketest-ta
225177
smoketest-ta:
226178
ADDONS_SOURCE_DIR="$(ADDONS_SOURCE_DIR)" \

packaging/technical-addon/packaging-scripts/cicd-tests/agent-bundle/orca-collectd-test.sh

Lines changed: 0 additions & 68 deletions
This file was deleted.

packaging/technical-addon/packaging-scripts/cicd-tests/agent-bundle/ta-agent-collectd-config.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)