File tree Expand file tree Collapse file tree 3 files changed +19
-3
lines changed Expand file tree Collapse file tree 3 files changed +19
-3
lines changed Original file line number Diff line number Diff line change 1- FROM mcr.microsoft.com/devcontainers/base:jammy
1+ FROM mcr.microsoft.com/devcontainers/base:ubuntu-24.04
22ENV YQ_VERSION=v4.27.5
33ENV TILT_VERSION=0.23.4
44ENV KUSTOMIZE_VERSION=v4.4.1
Original file line number Diff line number Diff line change 11{
22 "name" : " Codespace" ,
3+ "hostRequirements" : {
4+ "cpus" : 8 ,
5+ "memory" : " 32gb" ,
6+ "storage" : " 128gb"
7+ },
38 "build" : {
49 "context" : " ." ,
510 "dockerfile" : " Dockerfile"
8691 }
8792 }
8893 }
94+ },
95+ "vscode" : {
96+ "extensions" : [
97+ " ms-kubernetes-tools.vscode-kubernetes-tools" ,
98+ ]
8999 }
90100 },
91101 "containerEnv" : {
Original file line number Diff line number Diff line change @@ -23,9 +23,9 @@ for i in $(seq 0 $array_length); do
2323
2424 # Inject variables
2525 # We use `sed` to replace github variable references and avoid bad substitution error from bash
26- env_variables=$( yq ' .runs.steps[$i ].env | to_entries | .[] | .key + "=\"" + .value + "\"" ' .github/actions/deploy/action.yaml \
26+ env_variables=$( yq ' .runs.steps[' $i ' ].env | to_entries | .[] | .key + "=" + .value' .github/actions/deploy/action.yaml \
2727 | sed ' s/\${{.*}}//' )
28- eval " $env_variables "
28+ [ -n " $env_variables " ] && export $env_variables
2929
3030 if [ " $working_dir " != " null" ]; then
3131 echo " Changing working dir: $working_dir "
4545 if [[ " ${ENABLE_RING_TESTS} " == " false" ]]; then
4646 yq -i ' del(.locations[] | select(.locationType == "location-scality-ring-s3-v1"))' e2e-config.yaml
4747 fi
48+
49+ # Disable GCP tests as we don't have credentials setup in devcontainer
50+ yq -i ' del(.locations[] | select(.locationType == "location-gcp-v1"))' e2e-config.yaml
51+
4852 docker build -t $E2E_IMAGE_NAME :$E2E_IMAGE_TAG .
4953 kind load docker-image ${E2E_IMAGE_NAME} :${E2E_IMAGE_TAG}
5054 docker rmi ${E2E_IMAGE_NAME} :${E2E_IMAGE_TAG}
5357(
5458 cd .github/scripts/end2end
5559
60+ bash configure-e2e.sh
61+
5662 bash configure-e2e-ctst.sh
5763)
5864
You can’t perform that action at this time.
0 commit comments