Skip to content

Commit 5a84228

Browse files
committed
only deploy metadata when needed
Issue: ZENKO-4414
1 parent 102c8f8 commit 5a84228

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

.github/actions/deploy/action.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ runs:
8787
shell: bash
8888
run: bash deploy-metadata.sh
8989
working-directory: ./.github/scripts/end2end
90+
if: ${{ env.ENABLE_RING_TESTS == 'true' }}
9091
- name: End-to-end configuration
9192
shell: bash
9293
run: bash configure-e2e.sh "end2end" ${E2E_IMAGE_NAME}:${E2E_IMAGE_TAG} "default"

.github/workflows/end2end.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ env:
7575
GCP_BACKEND_SERVICE_KEY: ${{ secrets.GCP_BACKEND_SERVICE_KEY }}
7676
GCP_BACKEND_SERVICE_EMAIL: ${{ secrets.GCP_BACKEND_SERVICE_EMAIL }}
7777
# Enable this for Ring tests
78-
ENABLE_RING_TESTS: "true"
78+
ENABLE_RING_TESTS: "false"
7979
RING_S3C_ACCESS_KEY: accessKey1
8080
RING_S3C_SECRET_KEY: verySecretKey1
8181
RING_S3C_ENDPOINT: http://s3c.local:8000
@@ -553,6 +553,9 @@ jobs:
553553
needs: [build-kafka, build-test-image]
554554
runs-on:
555555
- ubuntu-22.04-8core
556+
env:
557+
ENABLE_RING_TESTS: "true"
558+
GIT_ACCESS_TOKEN: ${{ secrets.GIT_ACCESS_TOKEN }}
556559
steps:
557560
- name: Checkout
558561
uses: actions/checkout@v4
@@ -568,8 +571,6 @@ jobs:
568571
registry: ghcr.io
569572
- name: Deploy Zenko
570573
uses: ./.github/actions/deploy
571-
env:
572-
GIT_ACCESS_TOKEN: ${{ secrets.GIT_ACCESS_TOKEN }}
573574
- name: Run backbeat end to end tests
574575
run: bash run-e2e-test.sh "end2end" ${E2E_IMAGE_NAME}:${E2E_IMAGE_TAG} "backbeat" "default"
575576
working-directory: ./.github/scripts/end2end

tests/zenko_tests/e2e_config/locations.py

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env python
22

33
import logging
4+
import os
45

56
_log = logging.getLogger("end2end configuration")
67

@@ -11,6 +12,11 @@ def create_location(client, uuid, location):
1112
:param uuid: zenko instance uuid
1213
:param location: location details
1314
"""
15+
16+
ENABLE_RING_TESTS = os.environ['ENABLE_RING_TESTS']
17+
if ENABLE_RING_TESTS == "false" and location["locationType"] == "location-scality-ring-s3-v1":
18+
return
19+
1420
try:
1521
Location_V1 = client.get_model('location-v1')
1622
if "bootstrapList" not in location["details"]:

0 commit comments

Comments
 (0)