Fix component descriptor (#759)

* fix cd (run-int-tests)

* Test (run-int-tests)

* fix cd

* test (run-int-tests)

* Increase test timeout (run-int-tests)

---------

Co-authored-by: Robert Graeff <robert.graeff@sap.com>

.ci/component_descriptor

@@ -35,7 +35,6 @@ chmod +x ${COMP_CLI}
 SOURCE_PATH="$(dirname $0)/.."
 VERSION="$(${SOURCE_PATH}/hack/get-version.sh)"
 COMMIT_SHA="$(git --git-dir ${SOURCE_PATH}/.git rev-parse HEAD)"
-CTF_PATH="ctf-path"
 
 printf "> Building components with version ${VERSION} - ${COMMIT_SHA}\n"
 
@@ -93,7 +92,4 @@ ${COMP_CLI} ctf add "${CTF_PATH}" -f "${LS_CA_PATH}"
 
 # also upload the components to a open source repo
 # todo: remove as soon as the default component repository is public
-${COMP_CLI} ctf push --repo-ctx="eu.gcr.io/gardener-project/development" "${CTF_PATH}"
-
-# workaround as somehow changed the name of the cd
-cp base_component_descriptor_v2 component_descriptor_v2
+${COMP_CLI} ctf push --repo-ctx="eu.gcr.io/gardener-project/development" "${CTF_PATH}"

.landscaper/component-references.yaml

@@ -1,21 +1,21 @@
 ---
 componentName: github.com/gardener/landscaper/container-deployer
-name: landscaper
+name: container-deployer
 version: ${VERSION}
 ...
 ---
 componentName: github.com/gardener/landscaper/helm-deployer
-name: landscaper
+name: helm-deployer
 version: ${VERSION}
 ...
 ---
 componentName: github.com/gardener/landscaper/manifest-deployer
-name: landscaper
+name: manifest-deployer
 version: ${VERSION}
 ...
 ---
 componentName: github.com/gardener/landscaper/mock-deployer
-name: landscaper
+name: mock-deployer
 version: ${VERSION}
 ...
 

test/integration/deployers/management/dm_tests.go

@@ -188,7 +188,7 @@ func DeployerManagementTests(f *framework.Framework) {
 						return err
 					}
 					return nil
-				}, 3*time.Minute, 10*time.Second).Should(g.Succeed())
+				}, 10*time.Minute, 10*time.Second).Should(g.Succeed())
 
 				ginkgo.By("should delete the deployer when the Environment is removed")
 				testutil.ExpectNoError(f.Client.Delete(ctx, env))