fix conditional test running

Author: chingor13

.kokoro/common.sh

@@ -204,7 +204,7 @@ function generate_modified_modules_list() {
     if [[ -n $modules ]]; then
       modules=$(echo "${modules}" | cut -d '/' -f1 | sort -u)
       for module in $modules; do
-        if [[ ! " ${excluded_modules[*]} " =~ " ${module} " && " ${maven_modules[*]} " =~ " ${module} " ]]; then
+        if [[ " ${maven_modules[*]} " =~ " ${module} " ]]; then
           modified_module_list+=("${module}")
         fi
       done

.kokoro/presubmit/datastore-integration.cfg

@@ -35,7 +35,9 @@ env_vars: {
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "java-it-service-account"
-}env_vars: {
+}
+
+env_vars: {
   key: "BUILD_SUBDIR"
   value: "java-datastore"
 }

.kokoro/presubmit/logging-graalvm-native-presubmit.cfg

@@ -14,25 +14,30 @@ env_vars: {
 # TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
-  value: "cloud-java-ci-test"
+  value: "gcloud-devel"
 }
 
 env_vars: {
   key: "GOOGLE_CLOUD_PROJECT"
-  value: "cloud-java-ci-test"
+  value: "gcloud-devel"
 }
 
 env_vars: {
   key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/cloud-java-ci-it-service-account"
+  value: "secret_manager/java-it-service-account"
 }
 
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
-  value: "cloud-java-ci-it-service-account, java-bigqueryconnection-samples-secrets"
+  value: "java-it-service-account"
+}
+
+env_vars: {
+  key: "IT_SERVICE_ACCOUNT_EMAIL"
+  value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
 }
 
 env_vars: {
   key: "BUILD_SUBDIR"
-  value: "java-logging"
+  value: "java-datastore"
 }

.kokoro/presubmit/logging-integration.cfg

@@ -14,25 +14,30 @@ env_vars: {
 # TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
-  value: "cloud-java-ci-test"
+  value: "gcloud-devel"
 }
 
 env_vars: {
   key: "GOOGLE_CLOUD_PROJECT"
-  value: "cloud-java-ci-test"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "DATASTORE_PROJECT_ID"
+  value: "gcloud-devel"
 }
 
 env_vars: {
   key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/cloud-java-ci-it-service-account"
+  value: "secret_manager/java-it-service-account"
 }
 
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
-  value: "cloud-java-ci-it-service-account, java-bigqueryconnection-samples-secrets"
+  value: "java-it-service-account"
 }
 
 env_vars: {
   key: "BUILD_SUBDIR"
-  value: "java-logging"
+  value: "java-datastore"
 }