Zenko CI improvements

.devcontainer/README.md

@@ -3,11 +3,11 @@
 
 ## Running CTST tests in the codespace
 
-To run the CTST tests in the codespace, simply head to `.github/script/end2end/` and run `run-e2e-ctst.sh` script.
+To run the CTST tests in the codespace, simply head to `tests/@setup/` and run the `run-tests.sh` script.
 
 ```bash
-    cd .github/scripts/end2end/
-    bash run-e2e-ctst.sh
+    cd tests/@setup/
+    ./run-tests.sh ~/.kube/config ctst
 ```
 
 ## Accessing s3 service

.devcontainer/setup.sh

@@ -53,7 +53,7 @@ done
 (
     cd .github/scripts/end2end
 
-    bash configure-e2e-ctst.sh
+    bash configure-hosts.sh
 )
 
 docker image prune -af

.github/actions/build-setup-image/action.yaml

@@ -0,0 +1,66 @@
+name: Build Setup Image
+description: Build the Zenko setup Docker image for use in Kubernetes Jobs
+
+inputs:
+  registry:
+    description: 'Container registry to push to'
+    required: false
+    default: 'ghcr.io'
+  image-name:
+    description: 'Image name'
+    required: false
+    default: 'zenko-setup'
+  tag:
+    description: 'Image tag'
+    required: false
+    default: 'latest'
+  push:
+    description: 'Push image to registry'
+    required: false
+    default: 'true'
+
+outputs:
+  image:
+    description: 'Full image name with tag'
+    value: ${{ inputs.registry }}/${{ github.repository_owner }}/${{ inputs.image-name }}:${{ inputs.tag }}
+  digest:
+    description: 'Image digest'
+    value: ${{ steps.build.outputs.digest }}
+
+runs:
+  using: composite
+  steps:
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Log in to Container Registry
+      if: ${{ inputs.push == 'true' }}
+      uses: docker/login-action@v3
+      with:
+        registry: ${{ inputs.registry }}
+        username: ${{ github.actor }}
+        password: ${{ github.token }}
+
+    - name: Extract metadata
+      id: meta
+      uses: docker/metadata-action@v5
+      with:
+        images: ${{ inputs.registry }}/${{ github.repository_owner }}/${{ inputs.image-name }}
+        tags: |
+          type=ref,event=branch
+          type=ref,event=pr
+          type=sha,prefix={{branch}}-
+          type=raw,value=${{ inputs.tag }}
+
+    - name: Build and push
+      id: build
+      uses: docker/build-push-action@v5
+      with:
+        context: tests/@setup
+        file: tests/@setup/Dockerfile
+        push: ${{ inputs.push }}
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+        platforms: linux/amd64

.github/actions/deploy/action.yaml

@@ -7,10 +7,6 @@ inputs:
     description: "The tag of the Zenko Operator image to use"
     required: false
     default: ""
-  deploy_metadata:
-    description: "Deploy a metadata cluster alongside Zenko"
-    required: false
-    default: "false"
 runs:
   using: composite
   steps:
@@ -62,14 +58,6 @@ runs:
       shell: bash
       run: bash deploy-zenko.sh end2end default
       working-directory: ./.github/scripts/end2end
-    - name: Add Keycloak user and assign StorageManager role
-      shell: bash
-      run: bash keycloak-helper.sh set-user-instance-ids default
-      working-directory: ./.github/scripts/end2end
-    - name: Start external service mocks
-      shell: bash
-      run: bash install-mocks.sh "default"
-      working-directory: ./.github/scripts/end2end
     - name: Start mock sorbet service
       shell: bash
       run: sh tests/smoke/deploy-sorbet-resources.sh end2end
@@ -84,14 +72,9 @@ runs:
       env:
         SORBETD_NAME: mock-miria
       working-directory: ./.github/scripts/end2end/operator
-    - name: Deploy metadata
-      shell: bash
-      run: ./deploy-metadata.sh
-      working-directory: ./.github/scripts/end2end
-      if: ${{ inputs.deploy_metadata == 'true' }}
-    - name: End-to-end configuration
+    - name: Configure DNS for CTST
       shell: bash
-      run: bash configure-e2e.sh "end2end" ${E2E_IMAGE_NAME}:${E2E_IMAGE_TAG} "default"
+      run: bash configure-hosts.sh
       working-directory: ./.github/scripts/end2end
     - name: Linting
       shell: bash

.github/scripts/end2end/configure-hosts.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -exu
+
+echo "127.0.0.1 iam.zenko.local ui.zenko.local s3-local-file.zenko.local keycloak.zenko.local \
+    sts.zenko.local management.zenko.local s3.zenko.local website.mywebsite.com utilization.zenko.local" | sudo tee -a /etc/hosts