Add release tooling fixes: remove squash, remove black pre-commit.

d2iq-archive · Dec 15, 2021 · 353c80d · 353c80d
1 parent d59387c
commit 353c80d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,10 +1,10 @@
 repos:
-- repo: https://github.com/python/black
-  rev: stable
-  hooks:
-  - id: black
-    args: [--diff, --check]
-    language_version: python3.6
+# - repo: https://github.com/python/black
+  # rev: stable
+  # hooks:
+  # - id: black
+    # args: [--diff, --check]
+    # language_version: python3.6
 - repo: https://gitlab.com/pycqa/flake8
   rev: 3.7.7
   hooks:

diff --git a/Jenkinsfile.dcos-commons b/Jenkinsfile.dcos-commons
@@ -38,7 +38,7 @@ pipeline {
                 // Prevent indefinite hangs: DCOS-57576
                 timeout(activity: true, time: 1, unit: 'HOURS') {
                     // Build Docker image.
-                    sh("docker build --squash -f ${DOCKERFILE} -t mesosphere/${IMAGE}:latest .")
+                    sh("docker build -f ${DOCKERFILE} -t mesosphere/${IMAGE}:latest .")
                 }
             }
         }

diff --git a/Jenkinsfile.dcos-commons-base_ b/Jenkinsfile.dcos-commons-base_
@@ -39,7 +39,7 @@ pipeline {
                 // Prevent indefinite hangs: DCOS-57576
                 timeout(activity: true, time: 1, unit: 'HOURS') {
                     // Build Docker image.
-                    sh("docker build --squash -f ${DOCKERFILE} -t mesosphere/${IMAGE}:latest .")
+                    sh("docker build -f ${DOCKERFILE} -t mesosphere/${IMAGE}:latest .")
                 }
             }
         }