Skip to content

Commit

Permalink
adapt to latest template-operator release
Browse files Browse the repository at this point in the history
  • Loading branch information
lindnerby committed Oct 15, 2024
1 parent ec10a2f commit c891a29
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 16 deletions.
13 changes: 0 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@ on:
pull_request:
branches:
- main
# workflow_call:
# inputs:
# version:
# description: 'Version used for release builds'
# required: false
# type: string
# default: ""
workflow_dispatch:
jobs:
build-modulectl:
Expand All @@ -24,9 +17,3 @@ jobs:
cache-dependency-path: 'go.sum'
- name: "Run 'make build'"
run: make build
# run: |
# if [[ "${{ inputs.version }}" != "" ]]; then
# make build VERSION=${{ inputs.version }}
# else
# make build
# fi
6 changes: 3 additions & 3 deletions tests/e2e/create/create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ var _ = Describe("Test 'create' command", Ordered, func() {
Expect(resource.Name).To(Equal("template-operator"))
Expect(resource.Relation).To(Equal(ocmv1.ExternalRelation))
Expect(resource.Type).To(Equal("ociArtifact"))
Expect(resource.Version).To(Equal("1.0.0"))
Expect(resource.Version).To(Equal("1.0.1"))
resource = descriptor.Resources[1]
Expect(resource.Name).To(Equal("raw-manifest"))
Expect(resource.Version).To(Equal("1.0.3"))
Expand All @@ -320,7 +320,7 @@ var _ = Describe("Test 'create' command", Ordered, func() {
ociArtifactAccessSpec, ok := resourceAccessSpec0.(*ociartifact.AccessSpec)
Expect(ok).To(BeTrue())
Expect(ociArtifactAccessSpec.GetType()).To(Equal(ociartifact.Type))
Expect(ociArtifactAccessSpec.ImageReference).To(Equal("europe-docker.pkg.dev/kyma-project/prod/template-operator:1.0.0"))
Expect(ociArtifactAccessSpec.ImageReference).To(Equal("europe-docker.pkg.dev/kyma-project/prod/template-operator:1.0.1"))

By("And descriptor.component.resources[1].access should be correct")
resourceAccessSpec1, err := ocm.DefaultContext().AccessSpecForSpec(descriptor.Resources[1].Access)
Expand All @@ -347,7 +347,7 @@ var _ = Describe("Test 'create' command", Ordered, func() {
By("And security scan labels should be correct")
secScanLabels := flatten(descriptor.Sources[0].Labels)
Expect(secScanLabels).To(HaveKeyWithValue("git.kyma-project.io/ref", "HEAD"))
Expect(secScanLabels).To(HaveKeyWithValue("scan.security.kyma-project.io/rc-tag", "1.0.0"))
Expect(secScanLabels).To(HaveKeyWithValue("scan.security.kyma-project.io/rc-tag", "1.0.1"))
Expect(secScanLabels).To(HaveKeyWithValue("scan.security.kyma-project.io/language", "golang-mod"))
Expect(secScanLabels).To(HaveKeyWithValue("scan.security.kyma-project.io/dev-branch", "main"))
Expect(secScanLabels).To(HaveKeyWithValue("scan.security.kyma-project.io/subprojects", "false"))
Expand Down

0 comments on commit c891a29

Please sign in to comment.