Remove scf-helper release submodule (and use a final release instead)

SUSE · Dec 13, 2018 · f327a90 · f327a90
1 parent d050c98
commit f327a90
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 11 deletions.
diff --git a/.envrc b/.envrc
@@ -27,7 +27,6 @@ export FISSILE_DOCKER_ORGANIZATION=${FISSILE_DOCKER_ORGANIZATION:-'splatform'}
 # of all the releases that make up SCF
 FISSILE_RELEASE=""
 FISSILE_RELEASE="${FISSILE_RELEASE},${PWD}/src/scf-release"
-FISSILE_RELEASE="${FISSILE_RELEASE},${PWD}/src/scf-helper-release"
 
 export FISSILE_RELEASE="${FISSILE_RELEASE#,}"
 

diff --git a/.gitignore b/.gitignore
@@ -21,7 +21,6 @@ password
 # `make dist` output of various forms
 /output/
 personal-setup
-src/scf-helper-release/src/acceptance-tests-brain/test-resources/buildpack_inspector_buildpack/buildpack_inspector_buildpack-*.zip
 /OSCTEMP/
 /source-output/
 .final_releases
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "src/scf-helper-release"]
-	path = src/scf-helper-release
-	url = https://github.com/SUSE/scf-helper-release
 [submodule "src/uaa-fissile-release"]
 	path = src/uaa-fissile-release
 	url = https://github.com/SUSE/uaa-fissile-release

diff --git a/Makefile b/Makefile
@@ -124,12 +124,7 @@ uaa-helm: ${FISSILE_BINARY}
 scf-release:
 	make/bosh-release src/scf-release
 
-scf-helper-release:
-	cp container-host-files/etc/scf/config/role-manifest.yml src/scf-helper-release/src; \
-	make/bosh-release src/scf-helper-release
-
 releases: \
-	scf-helper-release \
 	scf-release \
 	uaa-releases \
 	${NULL}

diff --git a/container-host-files/etc/scf/config/role-manifest.yml b/container-host-files/etc/scf/config/role-manifest.yml
@@ -116,6 +116,10 @@ releases:
   version: "1.0.2"
   url: "https://s3.amazonaws.com/suse-final-releases/groot-btrfs-release-1.0.2.tgz"
   sha1: "1232559a679c7b588e735d35c1a8deb250fd8afd"
+- name: "scf-helper"
+  version: "1.0.1"
+  url: "https://s3.amazonaws.com/suse-final-releases/scf-helper-release-1.0.1.tgz"
+  sha1: "94bb4357cbe5fa07ddeb7efef1d1f7a2af8dfead"
 
 instance_groups:
 - name: syslog-scheduler

diff --git a/src/scf-helper-release b/src/scf-helper-release