Commit 311ba9b6 authored by David Diederich's avatar David Diederich
Browse files

Merge remote-tracking branch 'origin/master' into maven-build-script

Conflicts:
	cloud-providers/aws.yml
parents fb8a4718 473dd87b
Pipeline #38812 passed with stage
in 8 seconds
......@@ -101,6 +101,11 @@
#File Service Variables
TIME_ZONE: UTC
USER_ID: $AWS_COGNITO_AUTH_PARAMS_USER
#Entitlements V2 variables--start--
ENTITLEMENT_V2_URL: https://${AWS_BLUE_SUBDOMAIN}.${AWS_BASE_DOMAIN}/api/entitlements/v2/
TENANT: opendes
SERVICE_PRINCIPAL_EMAIL: serviceprincipal@testing.com
#Entitlements V2 variables--end--
.aws:
......
......@@ -20,6 +20,7 @@
# AZURE_SUBSCRIPTION_ID (Protected Branch)
# AZURE_SUBSCRIPTION_NAME (Protected Branch)
# AZURE_TENANT_ID (Protected Branch)
# AZURE_APPINSIGHTS_KEY (Protected Branch/Masked Variable)
# EXPECTED PIPELINE VARIABLES
# --------------------------------------------------------------------------------
......@@ -66,6 +67,7 @@
AZURE_AD_USER_OID: 469e9c25-ad0b-42e3-b023-03814437b21e
AZURE_AD_GUEST_EMAIL: integration.test@email.com
AZURE_AD_GUEST_OID: 4cf85597-116b-4aa5-bf03-7665a5b14ed5
AZURE_AD_APPINSIGHTS_KEY: $AZURE_APPINSIGHTS_KEY
# Legal Section
HOST_URL: https://${AZURE_DNS_NAME}/api/legal/v1/
AZURE_LEGAL_STORAGE_ACCOUNT: ${AZURE_BASE}data
......@@ -135,6 +137,8 @@ azure_containerize:
variables:
SHA_IMAGE: ${CI_PROJECT_NAME}-${CI_COMMIT_REF_SLUG}:${CI_COMMIT_SHA}
LATEST_IMAGE: ${CI_PROJECT_NAME}-${CI_COMMIT_REF_SLUG}:latest
extends:
- .azure_variables
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- az --version
......@@ -145,8 +149,21 @@ azure_containerize:
echo 'FROM openjdk:8-jdk-alpine
VOLUME /tmp
ARG JAR_FILE
ARG APPLICATIONINSIGHTS_INSTRUMENTATION_KEY
RUN apk add --update \
curl
# Application Insights Agent
ARG AGENT_VERSION=3.0.2
RUN mkdir -p /opt/agents \
&& chmod g+rwx /opt/agents \
&& curl -i -k -L https://github.com/microsoft/ApplicationInsights-Java/releases/download/${AGENT_VERSION}/applicationinsights-agent-${AGENT_VERSION}.jar -o /opt/agents/applicationinsights-agent.jar \
&& chmod 444 /opt/agents/applicationinsights-agent.jar
COPY ${JAR_FILE} app.jar
ENTRYPOINT ["java","-jar","/app.jar"]' > Dockerfile
ENV APPLICATIONINSIGHTS_CONNECTION_STRING=${APPLICATIONINSIGHTS_INSTRUMENTATION_KEY}
ENTRYPOINT ["java","-javaagent:/opt/agents/applicationinsights-agent.jar","-jar","/app.jar"]' > Dockerfile
- |
if [ "$AZURE_SERVICE" == "entitlements" ]; then
TARGET=$(find ./$AZURE_BUILD_SUBDIR/target -name '*.jar' |head -n 1)
......@@ -156,7 +173,7 @@ azure_containerize:
# Gitlab Container Registry
- echo "Startup Jar is $TARGET"
- docker build --build-arg JAR_FILE=$TARGET -t $CI_REGISTRY_IMAGE/$SHA_IMAGE .
- docker build --build-arg JAR_FILE=$TARGET --build-arg APPLICATIONINSIGHTS_INSTRUMENTATION_KEY=$AZURE_AD_APPINSIGHTS_KEY -t $CI_REGISTRY_IMAGE/$SHA_IMAGE .
- docker push ${CI_REGISTRY_IMAGE}/$SHA_IMAGE
- docker tag $CI_REGISTRY_IMAGE/$SHA_IMAGE $CI_REGISTRY_IMAGE/$LATEST_IMAGE
- docker push ${CI_REGISTRY_IMAGE}/$LATEST_IMAGE
......
......@@ -44,7 +44,7 @@ ibm-test:
stage: integration
extends:
- .ibm_variables
allow_failure: true
allow_failure: false
needs: ["ibm-deploy"]
script:
- apt-get update
......
......@@ -59,7 +59,7 @@ ibm-test:
stage: integration
image: python:3.8
needs: ["ibm-deploy"]
allow_failure: true
allow_failure: false
extends:
- .ibm_variables
script:
......@@ -79,4 +79,4 @@ ibm-test:
- $IBM == 'true'
except:
variables:
- $IBM_SKIP_TEST == 'true'
\ No newline at end of file
- $IBM_SKIP_TEST == 'true'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment