added env file support and also added other svc requirements

Author: Laeeqdev

Makefile

@@ -39,14 +39,10 @@ test-all: test-unit
 test-unit:
 	go test ./pkg/pipeline
 
-test-integration: make-binary-file-for-nil-check
-	export INTEGRATION_TEST_ENV_ID=$(docker run --env TEST_BRANCH=$TEST_BRANCH --env LATEST_HASH=$LATEST_HASH --privileged -d --name dind-test -v $PWD/tests/integrationTesting/:/tmp/ docker:dind)
-	docker exec ${INTEGRATION_TEST_ENV_ID} sh /tmp/create-test-env.sh
-	docker exec ${INTEGRATION_TEST_ENV_ID} sh /tests/integrationTesting/run-integration-test.sh
-
-make-binary-file-for-nil-check:
-	./runTimeMainScript.sh
-
+test-integration:
+	export INTEGRATION_TEST_ENV_ID=$(docker run --env  --privileged -d --name dind-test -v $PWD/:/test/ docker:dind)
+	docker exec ${INTEGRATION_TEST_ENV_ID} sh -c "cd test && ./tests/integrationTesting/create-test-env.sh"
+	docker exec ${INTEGRATION_TEST_ENV_ID} sh -c "cd test && ./tests/integrationTesting/run-integration-test.sh"
 run: build
 	./devtron
 

tests/integrationTesting/create-test-env.sh

@@ -18,6 +18,9 @@ kubectl create ns devtron-cd
 kubectl create ns devtron-ci
 kubectl -n devtroncd apply -f $PWD/tests/integrationTesting/postgresql-secret.yaml
 kubectl -ndevtroncd apply -f $PWD/tests/integrationTesting/postgresql.yaml
+kubectl -n devtroncd apply -f $PWD/tests/integrationTesting/devtron-secret.yaml
+kubectl -n devtroncd apply -f $PWD/tests/integrationTesting/nats-server.yaml
+kubectl -n devtroncd apply -f $PWD/tests/integrationTesting/devtron-nats-nodeport.yaml
 yq '(select(.metadata.name == "postgresql-migrate-devtron") | .spec.template.spec.containers[0].env[0].value) = env(TEST_BRANCH)' $PWD/tests/integrationTesting/migrator.yaml -i
 yq '(select(.metadata.name == "postgresql-migrate-devtron") | .spec.template.spec.containers[0].env[9].value) = env(LATEST_HASH)' $PWD/tests/integrationTesting/migrator.yaml -i
 kubectl -ndevtroncd apply -f $PWD/tests/integrationTesting/migrator.yaml
@@ -50,4 +53,6 @@ helm dependency up
 helm template devtron . --set installer.modules={cicd} -s templates/workflow.yaml >./argo_wf.yaml
 kubectl apply -f ./argo_wf.yaml
 while [ ! $(kubectl -n argo get deployment workflow-controller -o jsonpath="{.status.readyReplicas}")  ]; do sleep 10; done
-cd $PWD
+export NATS_SERVER_HOST=nats://$(kubectl get node  --no-headers  -o custom-columns=INTERNAL-IP:status.addresses[0].address):30236
+export PG_ADDR=$(kubectl get node  --no-headers  -o custom-columns=INTERNAL-IP:status.addresses[0].address)
+cd $PWD

tests/integrationTesting/devtron-nats-nodeport.yaml

@@ -0,0 +1,37 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: devtron-nats-for-nodeport
+  namespace: devtroncd
+spec:
+  ports:
+    - name: client
+      nodePort: 30236
+      port: 4222
+      protocol: TCP
+      targetPort: 4222
+    - name: cluster
+      port: 6222
+      protocol: TCP
+      targetPort: 6222
+    - name: monitor
+      port: 8222
+      protocol: TCP
+      targetPort: 8222
+    - name: metrics
+      port: 7777
+      protocol: TCP
+      targetPort: 7777
+    - name: leafnodes
+      port: 7422
+      protocol: TCP
+      targetPort: 7422
+    - name: gateways
+      port: 7522
+      protocol: TCP
+      targetPort: 7522
+  selector:
+    app.kubernetes.io/instance: devtron-nats
+    app.kubernetes.io/name: nats
+  sessionAffinity: None
+  type: NodePort

tests/integrationTesting/devtron-secret.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+data:
+  PG_PASSWORD: c2hhcmVkLWRldnRyb24tcGc=
+kind: Secret
+metadata:
+  annotations:
+    meta.helm.sh/release-name: orchestrator-oss-shared-cd-dcd
+    meta.helm.sh/release-namespace: devtroncd
+  creationTimestamp: "2024-03-19T13:58:54Z"
+  labels:
+    app.kubernetes.io/managed-by: Helm
+  name: devtron-secret
+  namespace: devtroncd
+type: Opaque

tests/integrationTesting/migrator.yaml

@@ -28,7 +28,7 @@ spec:
             - name: MIGRATE_TO_VERSION
               value: "0"
             - name: GIT_HASH
-              value: be7da471e45a501eba19eaa5f8d08dfe5601598d
+              value: 606a33bc5e9b15d8b1c404f0dfbd1c70b21b4063
           envFrom:
             - secretRef:
                 name: postgresql-migrator