Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix component descriptor #759

Merged
merged 5 commits into from
Jun 13, 2023
Merged

Fix component descriptor #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2669c81
fix cd (run-int-tests)
achimweigel Jun 12, 2023
99a2cd9
Test (run-int-tests)
robertgraeff Jun 12, 2023
684c43d
fix cd
achimweigel Jun 13, 2023
77e1d23
test (run-int-tests)
achimweigel Jun 13, 2023
dfe7fad
Increase test timeout (run-int-tests)
robertgraeff Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .ci/component_descriptor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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}"
8 changes: 4 additions & 4 deletions .landscaper/component-references.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
...

2 changes: 1 addition & 1 deletion test/integration/deployers/management/dm_tests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down