Merge branch 'aws-ignore-tests-cherry-pick' into 'release/0.25'

Added ignore for the AWS tests.

See merge request !467

devops/aws/pipeline/override-stages.yml

@@ -27,6 +27,20 @@ include:
     ref: release/0.25
 
 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
@@ -37,4 +51,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
+