Stress tests - use new mvn container (Azure#37743)

* use new mvn image
roryp · Nov 22, 2023 · f3d4499 · f3d4499
1 parent dadc95c
commit f3d4499
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/eng/containers/ci.yml b/eng/containers/ci.yml
@@ -22,19 +22,23 @@ variables:
     value: 'java/jdk-mariner-mvn'
   - name: imageTag
     value: $(build.buildid)
+  - name: stableTag
+    value: 'jdk11-latest' # 11 is the default in dockerfile
 
 steps:
 - task: Docker@2
   displayName: Build Docker Image
   inputs:
     command: build
     Dockerfile: $(dockerfile)
-    tags: $(imageTag)
-    arguments: '-t $(containerRegistry).azurecr.io/$(imageRepository):$(imageTag)'
+    tags: $(stableTag),$(imageTag)
+    arguments: >
+      -t $(containerRegistry).azurecr.io/$(imageRepository):$(imageTag)
+      -t $(containerRegistry).azurecr.io/$(imageRepository):$(stableTag)
 - task: Docker@2
   displayName: Push Docker Image
   inputs:
     containerRegistry: $(containerRegistry)
     repository: $(imageRepository)
     command: push
-    tags: $(imageTag)
+    tags: $(stableTag),$(imageTag)
diff --git a/sdk/eventhubs/azure-messaging-eventhubs-stress/Dockerfile b/sdk/eventhubs/azure-messaging-eventhubs-stress/Dockerfile
@@ -1,5 +1,7 @@
-ARG REGISTRY=""
-FROM ${REGISTRY}/java-tools/mvn:jdk11-latest as builder
+ARG REGISTRY="azsdkengsys.azurecr.io"
+FROM ${REGISTRY}/java/jdk-mariner-mvn:jdk11-latest as builder
+
+RUN yum update -y
 
 RUN mkdir /stress-eh
 WORKDIR /stress-eh
@@ -23,6 +25,8 @@ RUN --mount=type=cache,target=/root/.m2 \
 
 FROM mcr.microsoft.com/openjdk/jdk:11-mariner
 
+RUN yum update -y
+
 WORKDIR /app
 COPY --from=builder /stress-eh/sdk/eventhubs/azure-messaging-eventhubs-stress/target .
 

diff --git a/sdk/servicebus/azure-messaging-servicebus-stress/Dockerfile b/sdk/servicebus/azure-messaging-servicebus-stress/Dockerfile
@@ -1,6 +1,7 @@
-ARG REGISTRY=""
-FROM ${REGISTRY}/java-tools/mvn:jdk11-latest as builder
+ARG REGISTRY="azsdkengsys.azurecr.io"
+FROM ${REGISTRY}/java/jdk-mariner-mvn:jdk11-latest as builder
 
+RUN yum update -y
 RUN mkdir /stress-sb
 WORKDIR /stress-sb
 
@@ -16,13 +17,15 @@ RUN --mount=type=cache,target=/root/.m2 \
  mvn -f /stress-sb/sdk/core/azure-core/pom.xml clean install -Dcheckstyle.skip -Dgpg.skip -Dmaven.javadoc.skip -Drevapi.skip -Dspotbugs.skip -Djacoco.skip -DskipTests && \
  mvn -f /stress-sb/sdk/core/azure-core-test/pom.xml clean install -Dcheckstyle.skip -Dgpg.skip -Dmaven.javadoc.skip -Drevapi.skip -Dspotbugs.skip -Djacoco.skip -DskipTests && \
  mvn -f /stress-sb/sdk/core/azure-core-amqp/pom.xml clean install -Dcheckstyle.skip -Dgpg.skip -Dmaven.javadoc.skip -Drevapi.skip -Dspotbugs.skip -Djacoco.skip -DskipTests && \
- mvn -f /stress-sb/sdk/core/azure-core-metrics-opentelemetry/pom.xml clean install -Dcheckstyle.skip -Dgpg.skip -Dmaven.javadoc.skip -Drevapi.skip -Dspotbugs.skip -Djacoco.skip -DskipTests && \
  mvn -f /stress-sb/sdk/core/azure-core-http-netty/pom.xml clean install -Dcheckstyle.skip -Dgpg.skip -Dmaven.javadoc.skip -Drevapi.skip -Dspotbugs.skip -Djacoco.skip -DskipTests && \
+ mvn -f /stress-sb/sdk/core/azure-core-metrics-opentelemetry/pom.xml clean install -Dcheckstyle.skip -Dgpg.skip -Dmaven.javadoc.skip -Drevapi.skip -Dspotbugs.skip -Djacoco.skip -DskipTests && \
  mvn -f /stress-sb/sdk/servicebus/azure-messaging-servicebus/pom.xml clean install -Dcheckstyle.skip -Dgpg.skip -Dmaven.javadoc.skip -Drevapi.skip -Dspotbugs.skip -Djacoco.skip -DskipTests && \
  mvn -f /stress-sb/sdk/servicebus/azure-messaging-servicebus-stress/pom.xml clean install -Dcheckstyle.skip -Dgpg.skip -Dmaven.javadoc.skip -Drevapi.skip -Dspotbugs.skip -Djacoco.skip -DskipTests
 
 FROM mcr.microsoft.com/openjdk/jdk:11-mariner
 
+RUN yum update -y
+
 WORKDIR /app
 COPY --from=builder /stress-sb/sdk/servicebus/azure-messaging-servicebus-stress/target .