From 07a636fb8090df80c85f76ad1ca5d5bad403f0cf Mon Sep 17 00:00:00 2001
From: alex1545 <42874203+alex1545@users.noreply.github.com>
Date: Wed, 31 Jul 2019 12:49:05 -0400
Subject: [PATCH] Move basic image repro tests to GCB (#1040)

---
 .bazelci/presubmit.yml        |  4 ++++
 tests/contrib/repro_imgs.yaml | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 56869bc2a..e5c41d82d 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -15,9 +15,11 @@ platforms:
     # Disabled tests that do not run in BuildKite CI.
     - "-//tests/docker/security/..."
     # tests/docker/security require gcloud
+    - "-//tests/contrib:derivative_with_volume_repro_test"
     - "-//tests/contrib:java_pkg_want_failure"
     - "-//tests/contrib:python3_pkg_want_failure"
     - "-//tests/contrib:rbe-test-xenial_repro_test"
+    - "-//tests/contrib:set_cmd_repro_test"
     - "-//tests/contrib:test_compare_ids_test_diff_ids_fails"
     - "-//tests/contrib:test_compare_ids_test_invalid_tar_fails"
     - "-//tests/contrib:test_compare_ids_test_invalid_tar_fails_multi_regex"
@@ -40,9 +42,11 @@ platforms:
     # Disabled tests that do not run in BuildKite CI.
     - "-//tests/docker/security/..."
     # tests/docker/security require gcloud
+    - "-//tests/contrib:derivative_with_volume_repro_test"
     - "-//tests/contrib:java_pkg_want_failure"
     - "-//tests/contrib:python3_pkg_want_failure"
     - "-//tests/contrib:rbe-test-xenial_repro_test"
+    - "-//tests/contrib:set_cmd_repro_test"
     - "-//tests/contrib:test_compare_ids_test_diff_ids_fails"
     - "-//tests/contrib:test_compare_ids_test_invalid_tar_fails"
     - "-//tests/contrib:test_compare_ids_test_invalid_tar_fails_multi_regex"
diff --git a/tests/contrib/repro_imgs.yaml b/tests/contrib/repro_imgs.yaml
index 0935d74a4..4e324623f 100644
--- a/tests/contrib/repro_imgs.yaml
+++ b/tests/contrib/repro_imgs.yaml
@@ -24,6 +24,28 @@ steps:
   args:
   - ./tests/contrib/mv_project_root.sh
 
+  # Test basic image is reproducible.
+- name: "l.gcr.io/google/bazel"
+  args:
+  - --output_base=/workspace/output_base
+  - test
+  - --test_output=errors
+  - --spawn_strategy=standalone
+  - --verbose_failures
+  - //tests/contrib:set_cmd_repro_test
+  dir: 'rules_docker'
+
+  # Test image specifying volumes is reproducible.
+- name: "l.gcr.io/google/bazel"
+  args:
+  - --output_base=/workspace/output_base
+  - test
+  - --test_output=errors
+  - --spawn_strategy=standalone
+  - --verbose_failures
+  - //tests/contrib:derivative_with_volume_repro_test
+  dir: 'rules_docker'
+
   # Test RBE image is reproducible.
 - name: "l.gcr.io/google/bazel"
   args: