fix bucket names

Jenkinsfile

@@ -42,7 +42,7 @@ pipeline {
 
         IQE_PLUGINS="cost_management"
         BUILD_URL="https://ci.ext.devshift.net/job/koku-pipeline-pr-check-main/${BUILD_NUMBER}/"
-        IQE_ENV_VARS="JOB_NAME=koku-ci-jenkins,BUILD_NUMBER=${BUILD_NUMBER},BUILD_URL=${BUILD_URL}"
+        IQE_ENV_VARS="JOB_NAME=koku-ci-jenkins,BUILD_NUMBER=${BUILD_NUMBER},BUILD_URL=${BUILD_URL},SCHEMA_SUFFIX=_${IMAGE_TAG}"
         IQE_PARALLEL_ENABLED="false"
 
         GITHUB_API_ROOT='https://api.github.com/repos/project-koku/koku'

deploy/clowdapp.yaml

@@ -5743,9 +5743,9 @@ parameters:
 - name: S3_BUCKET_NAME
   value: hccm-eph-s3
 - name: S3_ROS_BUCKET_NAME
-  value: ros-eph-s3
+  value: hccm-ros-eph-s3
 - name: S3_SUBS_BUCKET_NAME
-  value: subs-eph-s3
+  value: hccm-subs-eph-s3
 - name: AWS_SHARED_CREDENTIALS_FILE
   value: /etc/aws/aws-credentials
 - description: GCP Credentials Location

deploy/kustomize/base/base.yaml

@@ -288,9 +288,9 @@ parameters:
 - name: S3_BUCKET_NAME
   value: hccm-eph-s3
 - name: S3_ROS_BUCKET_NAME
-  value: ros-eph-s3
+  value: hccm-ros-eph-s3
 - name: S3_SUBS_BUCKET_NAME
-  value: subs-eph-s3
+  value: hccm-subs-eph-s3
 - name: AWS_SHARED_CREDENTIALS_FILE
   value: "/etc/aws/aws-credentials"
 - name: GOOGLE_APPLICATION_CREDENTIALS

smoke_test.sh

@@ -10,7 +10,7 @@ IQE_MARKER_EXPRESSION="cost_smoke"
 IQE_FILTER_EXPRESSION=""
 IQE_CJI_TIMEOUT="5h"
 IQE_PARALLEL_ENABLED="false"
-IQE_ENV_VARS="JOB_NAME=${JOB_NAME},BUILD_NUMBER=${BUILD_NUMBER}"
+IQE_ENV_VARS="JOB_NAME=${JOB_NAME},BUILD_NUMBER=${BUILD_NUMBER},SCHEMA_SUFFIX=_${IMAGE_TAG}"
 
 # Get bonfire helper scripts
 CICD_URL="https://raw.githubusercontent.com/RedHatInsights/cicd-tools/main"
@@ -25,14 +25,9 @@ export BONFIRE_NS_REQUESTER="${JOB_NAME}-${BUILD_NUMBER}"
 export NAMESPACE=$(bonfire namespace reserve --duration 6h)
 SMOKE_NAMESPACE=$NAMESPACE
 
-oc get secret/koku-aws -o json -n ephemeral-base | jq -r '.data' > aws-creds.json
-oc get secret/koku-gcp -o json -n ephemeral-base | jq -r '.data' > gcp-creds.json
-oc get secret/koku-oci -o json -n ephemeral-base | jq -r '.data' > oci-creds.json
-
-AWS_CREDENTIALS_EPH=$(jq -r '."aws-credentials"' < aws-creds.json)
-GCP_CREDENTIALS_EPH=$(jq -r '."gcp-credentials"' < gcp-creds.json)
-OCI_CREDENTIALS_EPH=$(jq -r '."oci-credentials"' < oci-creds.json)
-OCI_CONFIG_EPH=$(jq -r '."oci-config"' < oci-creds.json)
+oc get secret koku-aws -o yaml -n ephemeral-base | grep -v '^\s*namespace:\s' | oc apply --namespace=${NAMESPACE} -f -
+oc get secret koku-gcp -o yaml -n ephemeral-base | grep -v '^\s*namespace:\s' | oc apply --namespace=${NAMESPACE} -f -
+oc get secret koku-oci -o yaml -n ephemeral-base | grep -v '^\s*namespace:\s' | oc apply --namespace=${NAMESPACE} -f -
 
 IQE_IBUTSU_SOURCE="cost-ephemeral-${IMAGE_TAG}"
 
@@ -47,10 +42,6 @@ bonfire deploy \
     --optional-deps-method hybrid \
     --no-single-replicas \
     --set-parameter rbac/MIN_REPLICAS=1 \
-    --set-parameter koku/AWS_CREDENTIALS_EPH=${AWS_CREDENTIALS_EPH} \
-    --set-parameter koku/GCP_CREDENTIALS_EPH=${GCP_CREDENTIALS_EPH} \
-    --set-parameter koku/OCI_CREDENTIALS_EPH=${OCI_CREDENTIALS_EPH} \
-    --set-parameter koku/OCI_CONFIG_EPH=${OCI_CONFIG_EPH} \
     ${COMPONENTS_ARG} \
     ${COMPONENTS_RESOURCES_ARG} \
     ${EXTRA_DEPLOY_ARGS}