Deploy rpms SVCs on vsphere

aojea · Jul 29, 2020 · 1007bbf · 1007bbf
1 parent 14e37f8
commit 1007bbf
Show file tree

Hide file tree

Showing 31 changed files with 23 additions and 5,014 deletions.
diff --git a/Makefile b/Makefile
@@ -240,7 +240,7 @@ build-farm-consistency:
 	@echo "diffing ns-ttl-controller assets ..."
 	diff -Naup ./core-services/ci-ns-ttl-controller/ci-ns-ttl-controller_dc.yaml ./clusters/build-clusters/01_cluster/openshift/ci-ns-ttl-controller/ci-ns-ttl-controller_dc.yaml
 	@echo "diffing rpms-ocp assets ..."
-	for file in ./core-services/release-controller/rpms-ocp-*.yaml; do diff -Naup "$${file}" "./clusters/build-clusters/01_cluster/openshift/release-controller/$${file##*/}"; done
+	for file in ./core-services/release-controller/rpms-ocp-*.yaml; do diff -Naup "$${file}" "./clusters/build-clusters/common/ocp/$${file##*/}"; done
 .PHONY: build-farm-consistency
 
 bump-pr:

diff --git a/clusters/JoinBuildFarm.md b/clusters/JoinBuildFarm.md
@@ -14,6 +14,13 @@ Claim a folder in [README.md](../README.md), e.g.,
 
 The folder `build-clusters/vsphere` then can be used to store the files related to the cluster.
 
+Make a softlink to the [common](./common)  folder.
+
+```
+$ cd build-clusters/vsphere
+$ ln -s ../common common
+```
+
 ## Set up applyConfig against the cluster
 
 Create the namespace:

diff --git a/clusters/build-clusters/01_cluster/common b/clusters/build-clusters/01_cluster/common
@@ -0,0 +1 @@
+../common
diff --git a/clusters/build-clusters/01_cluster/openshift/release-controller/rpms-ocp-4.1.yaml b/clusters/build-clusters/01_cluster/openshift/release-controller/rpms-ocp-4.1.yaml
diff --git a/clusters/build-clusters/01_cluster/openshift/release-controller/rpms-ocp-4.2.yaml b/clusters/build-clusters/01_cluster/openshift/release-controller/rpms-ocp-4.2.yaml