fixup! test ingestion of non versioned objets

Author: Kerkesni

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

@@ -89,6 +89,9 @@ kubectl run ${POD_NAME} \
   --env=RING_S3C_ENDPOINT=${RING_S3C_ENDPOINT} \
   --env=RING_S3C_BACKEND_SOURCE_LOCATION=${RING_S3C_BACKEND_SOURCE_LOCATION} \
   --env=RING_S3C_INGESTION_SRC_BUCKET_NAME=${RING_S3C_INGESTION_SRC_BUCKET_NAME} \
+  --env=RING_S3C_BACKEND_SOURCE_NON_VERSIONED_LOCATION=${RING_S3C_BACKEND_SOURCE_NON_VERSIONED_LOCATION} \
+  --env=RING_S3C_INGESTION_SRC_NON_VERSIONED_BUCKET_NAME=${RING_S3C_INGESTION_SRC_NON_VERSIONED_BUCKET_NAME} \
+  --env=RING_S3C_INGESTION_NON_VERSIONED_OBJECT_COUNT_PER_TYPE=${RING_S3C_INGESTION_NON_VERSIONED_OBJECT_COUNT_PER_TYPE} \
   --env=AWS_ACCESS_KEY=${AWS_ACCESS_KEY} \
   --env=AWS_SECRET_KEY=${AWS_SECRET_KEY} \
   --env=AWS_ENDPOINT=${AWS_ENDPOINT} \

.github/scripts/end2end/run-e2e-test.sh

@@ -106,6 +106,9 @@ run_e2e_test() {
         --env=RING_S3C_ENDPOINT=${RING_S3C_ENDPOINT} \
         --env=RING_S3C_BACKEND_SOURCE_LOCATION=${RING_S3C_BACKEND_SOURCE_LOCATION} \
         --env=RING_S3C_INGESTION_SRC_BUCKET_NAME=${RING_S3C_INGESTION_SRC_BUCKET_NAME} \
+        --env=RING_S3C_BACKEND_SOURCE_NON_VERSIONED_LOCATION=${RING_S3C_BACKEND_SOURCE_NON_VERSIONED_LOCATION} \
+        --env=RING_S3C_INGESTION_SRC_NON_VERSIONED_BUCKET_NAME=${RING_S3C_INGESTION_SRC_NON_VERSIONED_BUCKET_NAME} \
+        --env=RING_S3C_INGESTION_NON_VERSIONED_OBJECT_COUNT_PER_TYPE=${RING_S3C_INGESTION_NON_VERSIONED_OBJECT_COUNT_PER_TYPE} \
         --env=KEYCLOAK_TEST_USER=${KEYCLOAK_TEST_USER} \
         --env=KEYCLOAK_TEST_PASSWORD=${KEYCLOAK_TEST_PASSWORD} \
         --env=KEYCLOAK_TEST_HOST=${KEYCLOAK_TEST_HOST} \

tests/zenko_tests/cleans3c.py

@@ -15,6 +15,7 @@ def get_env(key, default=None, error=False):
 RING_S3C_ACCESS_KEY = get_env('RING_S3C_ACCESS_KEY')
 RING_S3C_SECRET_KEY = get_env('RING_S3C_SECRET_KEY')
 RING_S3C_INGESTION_SRC_BUCKET_NAME = get_env('RING_S3C_INGESTION_SRC_BUCKET_NAME')
+RING_S3C_INGESTION_SRC_NON_VERSIONED_BUCKET_NAME = get_env('RING_S3C_INGESTION_SRC_NON_VERSIONED_BUCKET_NAME')
 RING_S3C_ENDPOINT = get_env('RING_S3C_ENDPOINT')
 ENABLE_RING_TESTS = get_env('ENABLE_RING_TESTS')
 VERIFY_CERTIFICATES = get_env('VERIFY_CERTIFICATES', False)
@@ -39,3 +40,4 @@ def bucket_safe_delete(bucketname):
 
 _log.info('Removing S3C buckets...')
 bucket_safe_delete(RING_S3C_INGESTION_SRC_BUCKET_NAME)
+bucket_safe_delete(RING_S3C_INGESTION_SRC_NON_VERSIONED_BUCKET_NAME)