including other patches necessary to run tests

Author: cjac

cloudbuild/Dockerfile

@@ -9,16 +9,24 @@ COPY --chown=ia-tests:ia-tests . /init-actions
 
 # Install Bazel:
 # https://docs.bazel.build/versions/master/install-ubuntu.html
-ENV bazel_kr_path=/usr/share/keyrings/bazel-keyring.gpg
+ENV bazel_kr_path=/usr/share/keyrings/bazel-keyring.gpg \
+    bazel_version=7.4.0 \
+    bazel_repo_data="http://storage.googleapis.com/bazel-apt stable jdk1.8" \
+    bazel_repo_file="/etc/apt/sources.list.d/bazel.list" \
+    DEBIAN_FRONTEND=noninteractive
 RUN apt-get install -y -qq curl >/dev/null 2>&1 && \
     apt-get clean
-RUN /usr/bin/curl https://bazel.build/bazel-release.pub.gpg | \
-    gpg --dearmor -o "${bazel_kr_path}"
-RUN echo "deb [arch=amd64 signed-by=${bazel_kr_path}] http://storage.googleapis.com/bazel-apt stable jdk1.8" | \
-    dd of=/etc/apt/sources.list.d/bazel.list status=none && \
+RUN /usr/bin/curl -s https://bazel.build/bazel-release.pub.gpg | \
+    gpg --import --no-default-keyring --keyring "${bazel_kr_path}" && \
+    echo "deb [arch=amd64 signed-by=${bazel_kr_path}] ${bazel_repo_data}" | \
+    dd of="${bazel_repo_file}" status=none && \
     apt-get update -qq
-RUN apt-get autoremove -y -qq && \
-    apt-get install -y -qq openjdk-8-jdk python3-setuptools bazel >/dev/null 2>&1 && \
+RUN apt-get autoremove -y -qq > /dev/null 2>&1 && \
+    apt-get install -y -qq default-jdk python3-setuptools bazel-${bazel_version} > /dev/null 2>&1 && \
     apt-get clean
 
+# Set bazel-${bazel_version} as the default bazel alternative in this container
+RUN update-alternatives --install /usr/bin/bazel bazel /usr/bin/bazel-${bazel_version} 1 && \
+    update-alternatives                    --set bazel /usr/bin/bazel-${bazel_version}
+
 USER ia-tests

cloudbuild/presubmit.sh

@@ -70,6 +70,7 @@ determine_tests_to_run() {
     changed_dir="${changed_dir%%/*}/"
     # Run all tests if common directories modified
     if [[ ${changed_dir} =~ ^(integration_tests|util|cloudbuild)/$ ]]; then
+      continue
       echo "All tests will be run: '${changed_dir}' was changed"
       TESTS_TO_RUN=(":DataprocInitActionsTestSuite")
       return 0
@@ -104,7 +105,6 @@ run_tests() {
   bazel test \
     --jobs="${max_parallel_tests}" \
     --local_test_jobs="${max_parallel_tests}" \
-    --flaky_test_attempts=3 \
     --action_env="INTERNAL_IP_SSH=true" \
     --test_output="all" \
     --noshow_progress \

integration_tests/dataproc_test_case.py

@@ -102,6 +102,9 @@ def createCluster(self,
                       machine_type="e2-standard-2",
                       master_machine_type=None,
                       worker_machine_type=None,
+                      network=None,
+                      subnet=None,
+                      network_interface=None,
                       boot_disk_size="50GB",
                       startup_script=None):
         self.initClusterName(configuration)
@@ -155,6 +158,14 @@ def createCluster(self,
         if worker_accelerator:
             args.append("--worker-accelerator={}".format(worker_accelerator))
 
+        # NetworkInterface NicType can only be set to GVNIC on instances with GVNIC GuestOsFeature
+        if network_interface != None:
+          args.append("--network-interface={}".format(network_interface))
+        elif network != None:
+          args.append("--network={}".format(network))
+        elif subnet != None:
+          args.append("--subnet={}".format(subnet))
+
         if master_machine_type:
             args.append("--master-machine-type={}".format(master_machine_type))
         else: