Stop building broken builders (#173)

GoogleCloudPlatform · Dec 18, 2017 · 49c8280 · 49c8280
1 parent d52b788
commit 49c8280
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 149 deletions.
diff --git a/go/Dockerfile.wheezy b/go/Dockerfile.wheezy
diff --git a/go/cloudbuild.yaml b/go/cloudbuild.yaml
@@ -2,11 +2,9 @@
 # $ gcloud container builds submit . --config=cloudbuild.yaml
 
 steps:
-# Build the alpine and wheezy versions.
+# Build the alpine and debian versions.
 - name: 'gcr.io/cloud-builders/docker'
   args: ['build', '-f', 'Dockerfile.alpine', '--tag=gcr.io/$PROJECT_ID/go:alpine', '.']
-- name: 'gcr.io/cloud-builders/docker'
-  args: ['build', '-f', 'Dockerfile.wheezy', '--tag=gcr.io/$PROJECT_ID/go:wheezy', '.']
 - name: 'gcr.io/cloud-builders/docker'
   args: ['build', '-f', 'Dockerfile.debian', '--tag=gcr.io/$PROJECT_ID/go:debian', '.']
 
@@ -111,4 +109,7 @@ steps:
 - name: 'gcr.io/cloud-builders/docker'
   args: ['run', 'https_test:ubuntu']
 
-images: ['gcr.io/$PROJECT_ID/go', 'gcr.io/$PROJECT_ID/go:alpine', 'gcr.io/$PROJECT_ID/go:wheezy', 'gcr.io/$PROJECT_ID/go:debian']
+images:
+- 'gcr.io/$PROJECT_ID/go'
+- 'gcr.io/$PROJECT_ID/go:alpine'
+- 'gcr.io/$PROJECT_ID/go:debian'
diff --git a/go/go.wheezy.bash b/go/go.wheezy.bash
diff --git a/golang-project/Dockerfile.wheezy b/golang-project/Dockerfile.wheezy
diff --git a/golang-project/cloudbuild.yaml b/golang-project/cloudbuild.yaml
@@ -12,10 +12,6 @@ steps:
 - name: 'alpine'
   args: ['rm', 'gopath/bin/golang_project']
 
-# build the wheezy version
-- name: 'gcr.io/cloud-builders/docker'
-  args: ['build', '--file=Dockerfile.wheezy', '--tag=gcr.io/$PROJECT_ID/golang-project:wheezy', '.']
-
 # alpine is the default
 - name: 'gcr.io/cloud-builders/docker'
   args: ['tag', 'gcr.io/$PROJECT_ID/golang-project:alpine', 'gcr.io/$PROJECT_ID/golang-project']
@@ -64,4 +60,3 @@ steps:
 images:
   - 'gcr.io/$PROJECT_ID/golang-project'
   - 'gcr.io/$PROJECT_ID/golang-project:alpine'
-  - 'gcr.io/$PROJECT_ID/golang-project:wheezy'
diff --git a/golang-project/wheezy.bash b/golang-project/wheezy.bash
diff --git a/gradle/Dockerfile.jdk7 b/gradle/Dockerfile.jdk7
diff --git a/gradle/cloudbuild.yaml b/gradle/cloudbuild.yaml
@@ -25,18 +25,6 @@ steps:
   - '.'
   waitFor: ['-']
 
-# Build broken jdk7 builder.
-- name: 'gcr.io/cloud-builders/docker'
-  args:
-  - 'build'
-  - '--file=Dockerfile.jdk7'
-  - '--tag=gcr.io/$PROJECT_ID/gradle:4.0-jdk-7'
-  - '--tag=gcr.io/$PROJECT_ID/java/gradle:4.0-jdk-7'
-  - '--tag=gcr.io/$PROJECT_ID/gradle:3.5-jdk-7'
-  - '--tag=gcr.io/$PROJECT_ID/java/gradle:3.5-jdk-7'
-  - '.'
-  waitFor: ['-']
-
 # Tag the default 'latest' version
 - name: 'gcr.io/cloud-builders/docker'
   args:
@@ -67,11 +55,7 @@ steps:
 images:
 - 'gcr.io/$PROJECT_ID/gradle'
 - 'gcr.io/$PROJECT_ID/gradle:4.0-jdk-8'
-- 'gcr.io/$PROJECT_ID/gradle:4.0-jdk-7'
 - 'gcr.io/$PROJECT_ID/gradle:3.5-jdk-8'
-- 'gcr.io/$PROJECT_ID/gradle:3.5-jdk-7'
 - 'gcr.io/$PROJECT_ID/java/gradle'
 - 'gcr.io/$PROJECT_ID/java/gradle:4.0-jdk-8'
-- 'gcr.io/$PROJECT_ID/java/gradle:4.0-jdk-7'
 - 'gcr.io/$PROJECT_ID/java/gradle:3.5-jdk-8'
-- 'gcr.io/$PROJECT_ID/java/gradle:3.5-jdk-7'
diff --git a/gradle/jdk7.bash b/gradle/jdk7.bash
diff --git a/javac/Dockerfile.jdk7 b/javac/Dockerfile.jdk7
diff --git a/javac/cloudbuild.yaml b/javac/cloudbuild.yaml
@@ -17,15 +17,6 @@ steps:
   - '.'
   waitFor: ['-']
   id: 'BUILD_JDK_8'
-- name: 'gcr.io/cloud-builders/docker'
-  args:
-  - 'build'
-  - '--file=Dockerfile.jdk7'
-  - '--tag=gcr.io/$PROJECT_ID/javac:7'
-  - '--tag=gcr.io/$PROJECT_ID/java/javac:7'
-  - '.'
-  waitFor: ['-']
-  id: 'BUILD_JDK_7'
 
 # Test that javac and docker are installed, for all built images, and that apt-get update will work
 # in child images
@@ -44,8 +35,6 @@ steps:
 
 images:
 - 'gcr.io/$PROJECT_ID/javac:8'
-- 'gcr.io/$PROJECT_ID/javac:7'
 - 'gcr.io/$PROJECT_ID/javac'
 - 'gcr.io/$PROJECT_ID/java/javac:8'
-- 'gcr.io/$PROJECT_ID/java/javac:7'
 - 'gcr.io/$PROJECT_ID/java/javac'
diff --git a/javac/jdk7.bash b/javac/jdk7.bash
diff --git a/mvn/Dockerfile.jdk7 b/mvn/Dockerfile.jdk7
diff --git a/mvn/cloudbuild.yaml b/mvn/cloudbuild.yaml
@@ -26,18 +26,6 @@ steps:
   - '.'
   wait_for: ['-']
 
-# Build broken jdk7 builder.
-- name: 'gcr.io/cloud-builders/docker'
-  args:
-  - 'build'
-  - '--file=Dockerfile.jdk7'
-  - '--tag=gcr.io/$PROJECT_ID/mvn:3.5.0-jdk-7'
-  - '--tag=gcr.io/$PROJECT_ID/java/mvn:3.5.0-jdk-7'
-  - '--tag=gcr.io/$PROJECT_ID/mvn:3.3.9-jdk-7'
-  - '--tag=gcr.io/$PROJECT_ID/java/mvn:3.3.9-jdk-7'
-  - '.'
-  wait_for: ['-']
-
 # Tag a default builder version.
 - name: 'gcr.io/cloud-builders/docker'
   args:
@@ -67,12 +55,8 @@ steps:
 
 images:
 - 'gcr.io/$PROJECT_ID/mvn:3.5.0-jdk-8'
-- 'gcr.io/$PROJECT_ID/mvn:3.5.0-jdk-7'
 - 'gcr.io/$PROJECT_ID/mvn:3.3.9-jdk-8'
-- 'gcr.io/$PROJECT_ID/mvn:3.3.9-jdk-7'
 - 'gcr.io/$PROJECT_ID/mvn'
 - 'gcr.io/$PROJECT_ID/java/mvn:3.5.0-jdk-8'
-- 'gcr.io/$PROJECT_ID/java/mvn:3.5.0-jdk-7'
 - 'gcr.io/$PROJECT_ID/java/mvn:3.3.9-jdk-8'
-- 'gcr.io/$PROJECT_ID/java/mvn:3.3.9-jdk-7'
 - 'gcr.io/$PROJECT_ID/java/mvn'
diff --git a/mvn/jdk7.bash b/mvn/jdk7.bash