Skip to content

Commit 601068a

Browse files
dray92dray92
committed
tester
1 parent a08eef0 commit 601068a

File tree

1 file changed

+24
-31
lines changed

1 file changed

+24
-31
lines changed

‎.github/workflows/dsh-testing.yaml

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ jobs:
4646
aws-region: us-west-1
4747
role-duration-seconds: 7200
4848

49-
- name: Clone DevZero Self-Hosted Repository
50-
env:
51-
GH_PAT: ${{ secrets.GH_TOKEN }}
52-
run: |
53-
git clone https://[email protected]/devzero-inc/self-hosted.git
54-
5549
- name: Set up Terraform
5650
uses: hashicorp/setup-terraform@v3
5751
with:
@@ -79,7 +73,7 @@ jobs:
7973
8074
- name: Add Backend Override (Base Cluster)
8175
run: |
82-
cd self-hosted/terraform/examples/aws/base-cluster
76+
cd terraform/examples/aws/base-cluster
8377
cat <<EOF > backend_override.tf
8478
terraform {
8579
backend "s3" {
@@ -92,22 +86,21 @@ jobs:
9286
9387
- name: Set EKS version v${{ matrix.eks_version }} (Base Cluster)
9488
run: |
95-
echo "" >> self-hosted/terraform/examples/aws/base-cluster/terraform.tfvars
96-
echo "# Setting eks cluster version" >> self-hosted/terraform/examples/aws/base-cluster/terraform.tfvars
97-
echo "cluster_version = \"${{ matrix.eks_version }}\"" >> self-hosted/terraform/examples/aws/base-cluster/terraform.tfvars
89+
echo "" >> terraform/examples/aws/base-cluster/terraform.tfvars
90+
echo "# Setting eks cluster version" >> terraform/examples/aws/base-cluster/terraform.tfvars
91+
echo "cluster_version = \"${{ matrix.eks_version }}\"" >> terraform/examples/aws/base-cluster/terraform.tfvars
9892
9993
# DevZero currently doesnt publish a base AMI for Kubernetes 1.25, but local testing has indicated that we can use the 1.30 version
10094
# AMIs available https://us-west-1.console.aws.amazon.com/ec2/home?region=us-west-1#Images:visibility=public-images;imageName=:devzero;v=3
10195
# TODO (debo): this is currently kind of a hack to make sure that the 1.25 test uses the 1.30 node
10296
if [ "${{ matrix.eks_version }}" == "1.25" ]; then
103-
echo "# Using ami_version 1.30 for EKS 1.25 as a workaround" >> self-hosted/terraform/examples/aws/base-cluster/terraform.tfvars
104-
echo "ami_version = \"1.30\"" >> self-hosted/terraform/examples/aws/base-cluster/terraform.tfvars
105-
echo "" >> self-hosted/terraform/examples/aws/base-cluster/terraform.tfvars
97+
echo "# Using ami_version 1.30 for EKS 1.25 as a workaround" >> terraform/examples/aws/base-cluster/terraform.tfvars
98+
echo "ami_version = \"1.30\"" >> terraform/examples/aws/base-cluster/terraform.tfvars
10699
fi
107-
100+
108101
- name: Initialize and Apply Terraform (Base Cluster)
109102
run: |
110-
cd self-hosted/terraform/examples/aws/base-cluster
103+
cd terraform/examples/aws/base-cluster
111104
terraform init
112105
if [ "${{ github.event.inputs.base_image }}" == "al2023" ]; then
113106
terraform apply -auto-approve -var="cluster_name=$JOB_IDENTIFIER"
@@ -117,7 +110,7 @@ jobs:
117110
118111
- name: Update Cluster-Extensions tfvars
119112
run: |
120-
cat <<EOT > self-hosted/terraform/examples/aws/cluster-extensions/terraform.tfvars
113+
cat <<EOT > terraform/examples/aws/cluster-extensions/terraform.tfvars
121114
region = "us-west-1"
122115
enable_cluster_autoscaler = false
123116
cluster_name = "$JOB_IDENTIFIER"
@@ -126,7 +119,7 @@ jobs:
126119
127120
- name: Add Backend Override (Cluster Extensions)
128121
run: |
129-
cd self-hosted/terraform/examples/aws/cluster-extensions
122+
cd terraform/examples/aws/cluster-extensions
130123
cat <<EOF > backend_override.tf
131124
terraform {
132125
backend "s3" {
@@ -139,7 +132,7 @@ jobs:
139132
140133
- name: Initialize and Apply Cluster-Extensions
141134
run: |
142-
cd self-hosted/terraform/examples/aws/cluster-extensions
135+
cd terraform/examples/aws/cluster-extensions
143136
terraform init
144137
terraform apply -auto-approve
145138
@@ -149,7 +142,7 @@ jobs:
149142
150143
- name: Deploy Control Plane Dependencies (and modify domains)
151144
run: |
152-
cd self-hosted/charts/dz-control-plane-deps
145+
cd charts/dz-control-plane-deps
153146
find values -type f -exec sed -i'.bak' "s/example\.com/$JOB_IDENTIFIER\.ci\.selfzero\.net/g" {} \; && find values -name "*.bak" -delete
154147
make install
155148
@@ -161,14 +154,14 @@ jobs:
161154
# also setting image.pullsecrets to empty to make sure that each of the deployments dont try to pull their relevant OCI images from this registry
162155
# backend license key is ... needed
163156
164-
yq e '.credentials.enable = false | .backend.licenseKey = strenv(BACKEND_LICENSE_KEY) | .image.pullSecrets = []' -i self-hosted/charts/dz-control-plane/values.yaml
157+
yq e '.credentials.enable = false | .backend.licenseKey = strenv(BACKEND_LICENSE_KEY) | .image.pullSecrets = []' -i charts/dz-control-plane/values.yaml
165158
166159
- name: Deploy DevZero Control Plane (after configuring kubernetes to use dockerhub creds, and patching all the deployments to point to the right domain)
167160
env:
168161
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
169162
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
170163
run: |
171-
cd self-hosted/charts/dz-control-plane
164+
cd charts/dz-control-plane
172165
make add-docker-creds
173166
find . -name "values.yaml" -exec sed -i'.bak' "s/example\.com/$JOB_IDENTIFIER\.ci\.selfzero\.net/g" {} \; && find . -name "values.yaml.bak" -delete
174167
make install
@@ -177,20 +170,20 @@ jobs:
177170
run: |
178171
echo -e "\nPods in namespace devzero:"
179172
kubectl get pods -n devzero
180-
chmod +x self-hosted/.github/scripts/dsh-pod-test.sh
181-
self-hosted/.github/scripts/dsh-pod-test.sh
173+
chmod +x .github/scripts/dsh-pod-test.sh
174+
.github/scripts/dsh-pod-test.sh
182175
echo -e "\nIngress in namespace devzero:"
183176
kubectl get ingress -n devzero
184177
185178
- name: Deploy Data Plane Dependencies
186179
run: |
187-
cd self-hosted/charts/dz-data-plane-deps
180+
cd charts/dz-data-plane-deps
188181
find values -type f -exec sed -i'.bak' "s/example\.com/$JOB_IDENTIFIER\.ci\.selfzero\.net/g" {} \; && find values -name "*.bak" -delete
189182
make install
190183
191184
- name: Deploy DevZero Data Plane
192185
run: |
193-
cd self-hosted/charts/dz-data-plane
186+
cd charts/dz-data-plane
194187
find . -name "values.yaml" -exec sed -i'.bak' "s/example\.com/$JOB_IDENTIFIER\.ci\.selfzero\.net/g" {} \; && find . -name "values.yaml.bak" -delete
195188
make install
196189
@@ -202,37 +195,37 @@ jobs:
202195
- name: '[helm] Destroy data-plane'
203196
if: always()
204197
run: |
205-
cd self-hosted/charts/dz-data-plane
198+
cd charts/dz-data-plane
206199
make delete
207200
208201
- name: '[helm] Destroy data-plane-deps'
209202
if: always()
210203
run: |
211-
cd self-hosted/charts/dz-data-plane-deps
204+
cd charts/dz-data-plane-deps
212205
make delete
213206
214207
- name: '[helm] Destroy control-plane'
215208
if: always()
216209
run: |
217-
cd self-hosted/charts/dz-control-plane
210+
cd charts/dz-control-plane
218211
make delete
219212
220213
- name: '[helm] Destroy control-plane-deps'
221214
if: always()
222215
run: |
223-
cd self-hosted/charts/dz-control-plane-deps
216+
cd charts/dz-control-plane-deps
224217
make delete
225218
226219
- name: '[terraform] Destroy cluster-extensions'
227220
if: always()
228221
run: |
229-
cd self-hosted/terraform/examples/aws/cluster-extensions
222+
cd terraform/examples/aws/cluster-extensions
230223
terraform destroy -auto-approve
231224
232225
- name: '[terraform] Destroy base-cluster'
233226
if: always()
234227
run: |
235-
cd self-hosted/terraform/examples/aws/base-cluster
228+
cd terraform/examples/aws/base-cluster
236229
terraform destroy -auto-approve
237230
238231
- name: '[aws-cli] clean up volumes explicitly'

0 commit comments

Comments
 (0)