Merge pull request #4 from SAP/ci/rc

feat: add workflow to publish tagged images of a branch and fix e2e route

Author: Lasserich

.github/workflows/release-candidate.yaml

@@ -0,0 +1,76 @@
+# Release builds and publish a new release.
+
+# Secrets:
+# TEST_REGISTRY_USER: registry user for the container registry
+# TEST_REGISTRY_PASSWORD: password for container registry
+# Vars:
+# REGISTRY_URL: registry url for the container registry
+
+name: Publish Release Candidate
+
+on:
+    workflow_dispatch:
+      inputs:
+        nextVersion:
+          description: 'specify the release version in the semver format v[major].[minor].[patch] e.g. v0.0.0'
+          required: true
+
+# Releases need permissions to read and write the repository contents.
+# GitHub considers creating releases and uploading assets as writing contents.
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+    release:
+      runs-on: ubuntu-latest
+      steps:
+      - name: Set Version
+        id: version
+        run: echo "VERSION=fromPR-${{}}${{ github.event.inputs.nextVersion }}" >> $GITHUB_OUTPUT
+      - name: Print Version Number
+        run: echo "Effective version ${{ github.steps.version.outputs.VERSION }}"
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.4.0
+        with:
+          version: v0.15.1
+          install: true
+
+      - name: Checkout code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          submodules: true
+
+      - name: Fetch History
+        run: git fetch --prune --unshallow
+
+      - name: Set up Go
+        uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
+        with:
+          go-version: '1.21'
+
+      - name: Vendor Dependencies
+        run: make vendor vendor.check
+
+      - name: Build Images
+        run: make build VERSION=${{ github.steps.version.outputs.VERSION }}
+        env:
+          # We're using docker buildx, which doesn't actually load the images it
+          # builds by default. Specifying --load does so.
+          BUILD_ARGS: "--load"
+          DOCKER_REGISTRY: ${{ vars.REGISTRY_URL }}
+          BUILD_REGISTRY: ${{ vars.REGISTRY_URL }}
+
+      - name: Login to Container Registry
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        with:
+          registry: ${{ vars.REGISTRY_URL }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Publish Artifacts to DockerHub
+        run: make publish VERSION=${{ github.steps.version.outputs.VERSION }}
+        env:
+          DOCKER_REGISTRY: ${{ vars.REGISTRY_URL }}
+          BUILD_REGISTRY: ${{ vars.REGISTRY_URL }}

Makefile

@@ -6,6 +6,8 @@ PROJECT_REPO := github.com/SAP/$(PROJECT_NAME)
 
 
 PLATFORMS ?= linux_amd64 linux_arm64
+VERSION ?= $(shell git describe --tags --exact-match 2>/dev/null || git rev-parse HEAD)
+$(info VERSION is $(VERSION))
 
 # -include will silently skip missing files, which allows us
 # to load those files with a target in the Makefile. If only

test/e2e/test_env.go

@@ -29,7 +29,7 @@ var (
 	testenv       env.Environment
 	testOrgName   = "cf-ci-e2e"
 	testDomain    = "e2e.orchestrator.io"
-	testHostName  = "app-host"
+	testAppDomain = "cfapps.eu12.hana.ondemand.com"
 	testSpaceName = "e2e-space"
 	testQuotaName = "e2e-space-quota"
 )
@@ -44,7 +44,10 @@ func resetTestOrg(ctx context.Context, t *testing.T) {
 	if err != nil {
 		t.Fatalf("test org %s not accessible", testOrgName)
 	}
-	_ = deleteDomainRoute(ctx, cfClient, org, testDomain, testHostName)
+	_ = deleteRoute(ctx, cfClient, org, testDomain, "app-host")
+	_ = deleteRoute(ctx, cfClient, org, testAppDomain, "app-route-host-domainref")
+	_ = deleteRoute(ctx, cfClient, org, testAppDomain, "app-route-host-domainname")
+	_ = deleteDomain(ctx, cfClient, org, testDomain)
 	_ = deleteSpace(ctx, cfClient, org, testSpaceName)
 	_ = deleteQuota(ctx, cfClient, org, testQuotaName)
 }
@@ -105,14 +108,26 @@ func deleteSpace(ctx context.Context, cfClient *client.Client, org string, space
 
 }
 
-func deleteDomainRoute(ctx context.Context, cfClient *client.Client, org string, domain string, route string) error {
+func deleteDomain(ctx context.Context, cfClient *client.Client, org string, domain string) error {
+	d, err := cfClient.Domains.Single(ctx,
+		&client.DomainListOptions{
+			OrganizationGUIDs: client.Filter{Values: []string{org}},
+			Names:             client.Filter{Values: []string{domain}},
+		})
+	if err == nil {
+		_, err = cfClient.Domains.Delete(ctx, d.GUID)
+		return err
+	}
+	return err
+}
+
+func deleteRoute(ctx context.Context, cfClient *client.Client, org string, domain string, route string) error {
 	d, err := cfClient.Domains.Single(ctx,
 		&client.DomainListOptions{
 			OrganizationGUIDs: client.Filter{Values: []string{org}},
 			Names:             client.Filter{Values: []string{domain}},
 		})
 	if err == nil {
-		klog.V(4).Info("found test domain! cleaning up")
 		s, err := cfClient.Routes.Single(ctx,
 			&client.RouteListOptions{
 				OrganizationGUIDs: client.Filter{Values: []string{org}},
@@ -125,12 +140,10 @@ func deleteDomainRoute(ctx context.Context, cfClient *client.Client, org string,
 			_, err = cfClient.Routes.Delete(ctx, s.GUID)
 			return err
 		}
-		_, err = cfClient.Domains.Delete(ctx, d.GUID)
-		return err
+		return nil
 	}
-	return nil
+	return err
 }
-
 func deleteQuota(ctx context.Context, cfClient *client.Client, org string, quota string) error {
 	s, err := cfClient.SpaceQuotas.Single(ctx,
 		&client.SpaceQuotaListOptions{