Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit fffbbfa

Browse files
Merge pull request #614 from jcsirot/remove-obsolete-integrations
Remove 3rd party software integrations
2 parents 451f245 + 78a90f0 commit fffbbfa

File tree

76 files changed

+1
-3734
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1
-3734
lines changed

Dockerfile.gradle

Lines changed: 0 additions & 3 deletions
This file was deleted.

Jenkinsfile

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -158,25 +158,6 @@ pipeline {
158158
}
159159
}
160160
}
161-
stage("Gradle test") {
162-
agent { label 'ubuntu-1804 && x86_64 && overlay2' }
163-
steps {
164-
dir('src/github.com/docker/app') {
165-
checkout scm
166-
dir("bin") {
167-
unstash "binaries"
168-
}
169-
ansiColor('xterm') {
170-
sh 'make -f docker.Makefile gradle-test'
171-
}
172-
}
173-
}
174-
post {
175-
always {
176-
deleteDir()
177-
}
178-
}
179-
}
180161
stage("Test Linux") {
181162
agent { label 'ubuntu-1804 && x86_64 && overlay2' }
182163
environment {

Jenkinsfile.baguette

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -144,27 +144,6 @@ pipeline {
144144
}
145145
}
146146
}
147-
stage("Gradle test") {
148-
agent {
149-
label 'ubuntu-1804'
150-
}
151-
steps {
152-
dir('src/github.com/docker/app') {
153-
checkout scm
154-
dir("bin") {
155-
unstash "binaries"
156-
}
157-
ansiColor('xterm') {
158-
sh 'make -f docker.Makefile gradle-test'
159-
}
160-
}
161-
}
162-
post {
163-
always {
164-
deleteDir()
165-
}
166-
}
167-
}
168147
stage("Test Linux") {
169148
agent {
170149
label 'ubuntu-1804'

docker.Makefile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ BIN_IMAGE_NAME := $(BIN_NAME)-bin:$(BUILD_TAG)
66
CROSS_IMAGE_NAME := $(BIN_NAME)-cross:$(BUILD_TAG)
77
CLI_IMAGE_NAME := $(BIN_NAME)-cli:$(BUILD_TAG)
88
E2E_CROSS_IMAGE_NAME := $(BIN_NAME)-e2e-cross:$(BUILD_TAG)
9-
GRADLE_IMAGE_NAME := $(BIN_NAME)-gradle:$(BUILD_TAG)
109

1110
BIN_CTNR_NAME := $(BIN_NAME)-bin-$(TAG)
1211
CLI_CNTR_NAME := $(BIN_NAME)-cli-$(TAG)
@@ -113,10 +112,6 @@ coverage-results:
113112
# coverage is split in two like this so that CI can extract the results even on failure (which will be detected via the junit) using the individual steps, but for end users running we want the overall failure.
114113
coverage: coverage-run coverage-results
115114

116-
gradle-test:
117-
tar cf - Dockerfile.gradle bin/docker-app-linux integrations/gradle | docker build -t $(GRADLE_IMAGE_NAME) -f Dockerfile.gradle -
118-
docker run --rm $(GRADLE_IMAGE_NAME) bash -c "./gradlew --stacktrace build && cd example && gradle renderIt"
119-
120115
lint: ## run linter(s)
121116
$(info Linting...)
122117
docker build -t $(LINT_IMAGE_NAME) -f Dockerfile.lint .
@@ -168,4 +163,4 @@ push-invocation-image:
168163
help: ## this help
169164
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort
170165

171-
.PHONY: lint test-e2e test-unit test cli-cross cross e2e-cross coverage coverage-run coverage-results gradle-test shell build_dev_image tars vendor check-vendor schemas help invocation-image save-invocation-image save-invocation-image-tag push-invocation-image
166+
.PHONY: lint test-e2e test-unit test cli-cross cross e2e-cross coverage coverage-run coverage-results shell build_dev_image tars vendor check-vendor schemas help invocation-image save-invocation-image save-invocation-image-tag push-invocation-image

integrations/gradle/README.md

Lines changed: 0 additions & 38 deletions
This file was deleted.

integrations/gradle/build.gradle

Lines changed: 0 additions & 30 deletions
This file was deleted.

integrations/gradle/example/build.gradle

Lines changed: 0 additions & 14 deletions
This file was deleted.
Binary file not shown.

integrations/gradle/example/gradle/wrapper/gradle-wrapper.properties

Lines changed: 0 additions & 5 deletions
This file was deleted.

integrations/gradle/example/gradlew

Lines changed: 0 additions & 172 deletions
This file was deleted.

0 commit comments

Comments
 (0)