From aa9c73a657fd7b3ed5e49dca97a07de74435c05b Mon Sep 17 00:00:00 2001
From: Derek Hudson <dhudsons@amazon.com>
Date: Tue, 12 Dec 2023 11:42:47 -0600
Subject: [PATCH] Added ignore for the AWS tests.
---
devops/aws/pipeline/override-stages.yml | 27 +++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/devops/aws/pipeline/override-stages.yml b/devops/aws/pipeline/override-stages.yml
index bcdc513f7..3fec4d932 100644
--- a/devops/aws/pipeline/override-stages.yml
+++ b/devops/aws/pipeline/override-stages.yml
@@ -23,6 +23,20 @@ include:
file: "cloud-providers/aws-maven.yml"
aws-test-java:
+ image: $CI_REGISTRY/osdu/platform/deployment-and-operations/base-containers-aws/aws-maven/aws-maven:v2.1
+ extends:
+ - .maven
+ - .aws
+ - .aws_common_variables
+ - .aws_variables
+ stage: integration
+ allow_failure: true
+ needs: [{ job: 'aws-update-tf', optional: true }, { job: 'aws-update-helm', optional: true }, { job: 'aws-update-eks', optional: true }]
+ retry: 1
+ before_script:
+ - !reference [.maven, before_script]
+ - !reference [.aws, before_script]
+ - !reference [.aws_variables, before_script]
script:
- export KUBECONFIG=/tmp/kubeconfig-${RANDOM}.yaml
- aws eks update-kubeconfig --region $AWS_REGION --name $EKS_CLUSTER_NAME --role-arn $EKS_CLUSTER_MGMT_ROLE
@@ -33,5 +47,18 @@ aws-test-java:
- python3 $PUSH_ENDPOINT_PATH/setup_teardown_endpoint.py --create --environment_file $PUSH_ENDPOINT_PATH/environment_file.sh --kube_file $PUSH_ENDPOINT_PATH/push-endpoint-manifest.yaml
- trap "python3 $PUSH_ENDPOINT_PATH/setup_teardown_endpoint.py --delete --environment_file $PUSH_ENDPOINT_PATH/environment_file.sh --kube_file $PUSH_ENDPOINT_PATH/push-endpoint-manifest.yaml" EXIT
- source $PUSH_ENDPOINT_PATH/environment_file.sh
+ - export REGISTER_CUSTOM_PUSH_PATH=/api/push-endpoint/0
+ - export REGISTER_CUSTOM_PUSH_URL_HMAC=$NOTIFICATION_REGISTER_BASE_URL$REGISTER_CUSTOM_PUSH_PATH
+ - export OSDU_TENANT=int-test-notification
+ - export TENANT_NAME=int-test-notification
- $MAVEN_BUILD $INTEGRATION_TEST_DIR maven-aws-integration-test-output.log ${AWS_MAVEN_TEST_COMMAND_OVERRIDE:-test} --update-snapshots -DdisableXmlReport=true
+ only:
+ variables:
+ #Default if not defined
+ - $AWS_SKIP_DEPLOY != 'true' && $AWS_SKIP_TESTS != 'true' && $AWS == '1' && ($AWS_INT_TEST_TYPE == 'java' || $AWS_INT_TEST_TYPE == null)
+ artifacts:
+ when: always
+ paths:
+ - $INTEGRATION_TEST_DIR
+ expire_in: 2 days
--
GitLab