From e788f1ae6b4245fd3dd3b005d45843b2489edda0 Mon Sep 17 00:00:00 2001
From: Tejaswini Bandlamudi <96047043+tejaswini-imply@users.noreply.github.com>
Date: Mon, 20 Feb 2023 16:15:15 +0530
Subject: [PATCH] Add option to run standard & revised ITs manually on PRs
 (#13814)

Create the docker image in case of maven dependencies cache restore failure too as env.sh file is removed on maven rebuild.
Increase java heap size for security IT failing with error
---
 .github/workflows/reusable-revised-its.yml  | 2 +-
 .github/workflows/reusable-standard-its.yml | 4 ++--
 .github/workflows/revised-its.yml           | 3 ++-
 .github/workflows/standard-its.yml          | 3 ++-
 integration-tests/pom.xml                   | 2 +-
 it.sh                                       | 3 ++-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/reusable-revised-its.yml b/.github/workflows/reusable-revised-its.yml
index 326ce857197..4e90805e9f1 100644
--- a/.github/workflows/reusable-revised-its.yml
+++ b/.github/workflows/reusable-revised-its.yml
@@ -90,7 +90,7 @@ jobs:
           ./it.sh ci
 
       - name: Create docker image
-        if: steps.docker-restore.outputs.cache-hit != 'true'
+        if: steps.docker-restore.outputs.cache-hit != 'true' || steps.maven-restore.outputs.cache-hit != 'true'
         env:
           docker-restore: ${{ toJson(steps.docker-restore.outputs) }}
         run: |
diff --git a/.github/workflows/reusable-standard-its.yml b/.github/workflows/reusable-standard-its.yml
index cb3c7012708..489be63edbe 100644
--- a/.github/workflows/reusable-standard-its.yml
+++ b/.github/workflows/reusable-standard-its.yml
@@ -86,5 +86,5 @@ jobs:
         run: |
           # Debug echo
           echo "Mysql driver: ${MYSQL_DRIVER_CLASSNAME}"
-          echo "MAVEN_OPTS='-Xmx2048m' ${MVN} verify -pl integration-tests -P integration-tests ${{ inputs.testing_groups }} -Djvm.runtime=${{ inputs.runtime_jdk }} -Dit.indexer=${{ inputs.use_indexer }} ${MAVEN_SKIP} -Doverride.config.path=${{ inputs.override_config_path }}"
-          MAVEN_OPTS='-Xmx2048m' ${MVN} verify -pl integration-tests -P integration-tests ${{ inputs.testing_groups }} -Djvm.runtime=${{ inputs.runtime_jdk }} -Dit.indexer=${{ inputs.use_indexer }} ${MAVEN_SKIP} -Doverride.config.path=${{ inputs.override_config_path }}
+          echo "${MVN} verify -pl integration-tests -P integration-tests ${{ inputs.testing_groups }} -Djvm.runtime=${{ inputs.runtime_jdk }} -Dit.indexer=${{ inputs.use_indexer }} ${MAVEN_SKIP} -Doverride.config.path=${{ inputs.override_config_path }}"
+          ${MVN} verify -pl integration-tests -P integration-tests ${{ inputs.testing_groups }} -Djvm.runtime=${{ inputs.runtime_jdk }} -Dit.indexer=${{ inputs.use_indexer }} ${MAVEN_SKIP} -Doverride.config.path=${{ inputs.override_config_path }}
diff --git a/.github/workflows/revised-its.yml b/.github/workflows/revised-its.yml
index afed291d798..e4cf409ee6b 100644
--- a/.github/workflows/revised-its.yml
+++ b/.github/workflows/revised-its.yml
@@ -15,7 +15,8 @@
 
 # Github workflow that runs revised/new ITs
 on:
-  workflow_call
+  workflow_call:
+  workflow_dispatch:
 
 jobs:
   it:
diff --git a/.github/workflows/standard-its.yml b/.github/workflows/standard-its.yml
index e6a286774b7..1894340cd91 100644
--- a/.github/workflows/standard-its.yml
+++ b/.github/workflows/standard-its.yml
@@ -15,7 +15,8 @@
 
 # Github workflow that runs standard/old ITs
 on:
-  workflow_call
+  workflow_call:
+  workflow_dispatch:
 
 jobs:
   integration-index-tests-middleManager:
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 258e0b700be..ad4164797d2 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -649,7 +649,7 @@
                                 </property>
                             </properties>
                             <argLine>
-                                -Xmx64m
+                                -Xmx128m
                                 -Duser.timezone=UTC
                                 -Dfile.encoding=UTF-8
                                 -Ddruid.test.config.dockerIp=${env.DOCKER_IP}
diff --git a/it.sh b/it.sh
index 77da6f3680c..e15e9413f92 100755
--- a/it.sh
+++ b/it.sh
@@ -185,6 +185,7 @@ function verify_env_vars {
 
 CMD=$1
 shift
+MAVEN_IGNORE="-P skip-static-checks,skip-tests -Dmaven.javadoc.skip=true"
 
 case $CMD in
   "help" )
@@ -194,7 +195,7 @@ case $CMD in
     mvn -q clean package dependency:go-offline -P dist $MAVEN_IGNORE
     ;;
   "build" )
-    mvn clean package -P dist,skip-static-checks,skip-tests -Dmaven.javadoc.skip=true -T1.0C $*
+    mvn clean package -P dist $MAVEN_IGNORE -T1.0C $*
     ;;
   "dist" )
     mvn package -P dist $MAVEN_IGNORE -pl :distribution