diff --git a/.github/scripts/end2end/patch-coredns.sh b/.github/scripts/end2end/patch-coredns.sh index f33e7c4d5..b8b40fa37 100755 --- a/.github/scripts/end2end/patch-coredns.sh +++ b/.github/scripts/end2end/patch-coredns.sh @@ -36,6 +36,7 @@ corefile=" rewrite name exact prom.dr.zenko.local ingress-nginx-controller.ingress-nginx.svc.cluster.local rewrite name exact shell-ui.dr.zenko.local ingress-nginx-controller.ingress-nginx.svc.cluster.local rewrite name exact website.mywebsite.com ingress-nginx-controller.ingress-nginx.svc.cluster.local + rewrite name exact s3c.local s3c-cloudserver.metadata.svc.cluster.local kubernetes cluster.local in-addr.arpa ip6.arpa { pods insecure fallthrough in-addr.arpa ip6.arpa diff --git a/.github/workflows/end2end.yaml b/.github/workflows/end2end.yaml index 282c284bc..6a2adc0a3 100644 --- a/.github/workflows/end2end.yaml +++ b/.github/workflows/end2end.yaml @@ -75,10 +75,10 @@ env: GCP_BACKEND_SERVICE_KEY: ${{ secrets.GCP_BACKEND_SERVICE_KEY }} GCP_BACKEND_SERVICE_EMAIL: ${{ secrets.GCP_BACKEND_SERVICE_EMAIL }} # Enable this for Ring tests - ENABLE_RING_TESTS: "false" - RING_S3C_ACCESS_KEY: ${{ secrets.RING_S3C_BACKEND_ACCESS_KEY }} - RING_S3C_SECRET_KEY: ${{ secrets.RING_S3C_BACKEND_SECRET_KEY }} - RING_S3C_ENDPOINT: ${{ secrets.RING_S3C_BACKEND_ENDPOINT }} + ENABLE_RING_TESTS: "true" + RING_S3C_ACCESS_KEY: accessKey1 + RING_S3C_SECRET_KEY: verySecretKey1 + RING_S3C_ENDPOINT: http://s3c.local:8000 RING_S3C_BACKEND_SOURCE_LOCATION: rings3cbackendingestion RING_S3C_INGESTION_SRC_BUCKET_NAME: ingestion-test-src-bucket-${{ github.run_id }}-${{ github.run_attempt }} # CTST end2end tests diff --git a/tests/zenko_tests/node_tests/package.json b/tests/zenko_tests/node_tests/package.json index 917314107..d2e7003ff 100644 --- a/tests/zenko_tests/node_tests/package.json +++ b/tests/zenko_tests/node_tests/package.json @@ -53,7 +53,7 @@ "test_operator": "mocha --tags ${MOCHA_TAGS} --exit -t 10000 --reporter mocha-multi-reporters --reporter-options configFile=config.json ./init_test.js", "test_smoke": "mocha --tags ${MOCHA_TAGS} --exit -t 10000 --reporter mocha-multi-reporters --reporter-options configFile=config.json --recursive smoke_tests", "test_iam_policies": "mocha --tags ${MOCHA_TAGS} --exit -t 15000 --reporter mocha-multi-reporters --reporter-options configFile=config.json --recursive iam_policies", - "test_all_extensions": "run-p --aggregate-output test_aws_crr test_expiration test_transition", + "test_all_extensions": "run-p --aggregate-output test_aws_crr test_expiration test_transition test_ingestion_oob_s3c", "test_object_api": "mocha --tags ${MOCHA_TAGS} --exit -t 10000 --reporter mocha-multi-reporters --reporter-options configFile=config.json --recursive cloudserver/keyFormatVersion/tests", "lint": "eslint $(find . -name '*.js' -not -path '*/node_modules/*')" },