making reviewed changes

Signed-off-by: ntishchauhan0022 <nitishchauhan0022@gmail.com>

.circleci/config.yml

@@ -160,33 +160,29 @@ jobs:
             curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
             chmod +x kubectl
             mv kubectl /home/circleci/bin/
-            make download # no-op if we restored from cache
+            mage download # no-op if we restored from cache
 
       - run:
           name: Build
           command: |
-            make build-ci
-            make build-docker-full-bundle
+            mage buildCI
+            mage buildDockers full-bundle
 
       - run:
           name: e2e test environment setup
-          command: make tests-e2e-setup
+          command: mage teste2eSetup
 
       - run:
           name: Enable integration tests
           command: echo 'export INTEGRATION_ENABLED="true"' >> $BASH_ENV
 
       - run:
           name: e2e tests
-          command: make tests-e2e-no-setup
-
-      - run:
-          name: e2e test environment teardown
-          command: make tests-e2e-teardown
+          command: mage testse2eNoSetup
 
       - run:
           name: Prepare reports
-          command: make junit-report
+          command: mage junitReport
           when: always
 
       - store_test_results:
@@ -288,7 +284,7 @@ jobs:
             curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
             chmod +x kubectl
             sudo mv kubectl /usr/local/bin/
-            make download # no-op if we restored from cache
+            mage download # no-op if we restored from cache
 
       - run:
           name: Build armadactl release artifacts
@@ -429,7 +425,7 @@ jobs:
             curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
             chmod +x kubectl
             sudo mv kubectl /usr/local/bin/
-            make download # no-op if we restored from cache
+            mage download # no-op if we restored from cache
 
       - run:
           name: Push dotnet clients to nuget
@@ -440,7 +436,7 @@ jobs:
             go mod download
             go run github.com/magefile/mage@v1.14.0 -v BootstrapTools
             go run github.com/magefile/mage@v1.14.0 -v proto
-            RELEASE_TAG=${CIRCLE_TAG#"v"} make push-nuget
+            RELEASE_TAG=${CIRCLE_TAG#"v"} mage pushNuget
 
       - store_artifacts:
           path: bin/client/DotNet

.github/workflows/airflow-operator-release-to-pypi.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           version: '3.17.3'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - run: make airflow-operator
+      - run: mage airflowOperator
       - uses: ./.github/workflows/python-tests
         with:
           python-version: '3.8'

.github/workflows/airflow-operator.yml

@@ -14,7 +14,6 @@ on:
       - 'docs/python_airflow_operator.md'
       - 'docs/python_armada_client.md'
       - 'internal/jobservice/*'
-      - 'makefile'
       - 'pkg/api/*.proto'
       - 'pkg/api/jobservice/*.proto'
       - 'scripts/build-airflow-operator.sh'
@@ -34,7 +33,6 @@ on:
       - 'docs/python_airflow_operator.md'
       - 'docs/python_armada_client.md'
       - 'internal/jobservice/*'
-      - 'makefile'
       - 'pkg/api/*.proto'
       - 'pkg/api/jobservice/*.proto'
       - 'scripts/build-airflow-operator.sh'
@@ -62,7 +60,7 @@ jobs:
         with:
           version: '3.17.3'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - run: make airflow-operator
+      - run: mage airflowOperator
       - uses: ./.github/workflows/python-tests
         with:
           python-version: ${{ matrix.python }}
@@ -106,5 +104,5 @@ jobs:
         with:
           version: '3.17.3'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - run: make tests-e2e-airflow
+      - run: mage teste2eAirflow
 

.github/workflows/build-release-images.yml

@@ -17,12 +17,12 @@ jobs:
     steps:
       - uses: actions/checkout@v3.1.0
       - uses: ./.github/workflows/go-setup
-      - run: make build-ci
-      - run: make tests-e2e-setup
-      - run: make tests-e2e-no-setup
+      - run: mage BuildCI
+      - run: mage teste2eSetup
+      - run: mage testse2eNoSetup
         env:
           INTEGRATION_ENABLED: true
-      - run: make junit-report
+      - run: mage junitReport
       - name: Upload junit report
         uses: actions/upload-artifact@v3.1.1
         with:
@@ -33,7 +33,7 @@ jobs:
       - name: Save docker images to artifact
         run: |
           mkdir -p docker-images
-          docker save armada | gzip > docker-images/armada.tar.gz
+          docker save armada-server | gzip > docker-images/armada-server.tar.gz 
           docker save armada-executor | gzip > docker-images/armada-executor.tar.gz
           docker save armadactl | gzip > docker-images/armadactl.tar.gz
           docker save testsuite | gzip > docker-images/testsuite.tar.gz

.github/workflows/codeql-analysis.yml

@@ -46,8 +46,8 @@ jobs:
         version: '3.17.3'
         repo-token: ${{ secrets.GITHUB_TOKEN }}
     - uses: ./.github/workflows/go-setup
-    - name: Make Proto
-      run: make proto
+    - name: Mage Proto
+      run: mage proto
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/go-setup/action.yml

@@ -9,4 +9,4 @@ runs:
         go-version: ${{ matrix.go }}
     - name: Setup dependencies
       shell: bash
-      run: make download
+      run: mage download

.github/workflows/python-client.yml

@@ -87,4 +87,4 @@ jobs:
         with:
           version: '3.17.3'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - run: make tests-e2e-python
+      - run: mage teste2epython

.github/workflows/python-tests/action.yml

@@ -34,7 +34,7 @@ runs:
         version: '3.17.3'
         repo-token: ${{ inputs.github-token }}
     # Generate the proto files for python, required for later steps
-    - run: make python
+    - run: mage buildPython
       shell: bash
     - name: Run tox format environment
       run: tox -e format

.goreleaser.yml

@@ -369,8 +369,8 @@ dockers:
     goos: linux
     goarch: amd64
     image_templates:
-      - "{{ .Env.DOCKER_REPO }}armada-testsuite:latest"
-      - "{{ .Env.DOCKER_REPO }}armada-testsuite:{{ .Version }}"
+      - "{{ .Env.DOCKER_REPO }}testsuite:latest"
+      - "{{ .Env.DOCKER_REPO }}testsuite:{{ .Version }}"
     build_flag_templates: *BUILD_FLAG_TEMPLATES
     ids:
       - testsuite

magefiles/airflow.go

@@ -72,7 +72,7 @@ func stopAirflow() error {
 }
 
 // AirflowOperator builds the Airflow Operator
-func airflowOperator() error {
+func AirflowOperator() error {
 	fmt.Println("Building Airflow Operator...")
 
 	err := os.RemoveAll("proto-airflow")
@@ -85,12 +85,12 @@ func airflowOperator() error {
 		return fmt.Errorf("failed to create proto-airflow directory: %w", err)
 	}
 
-	_, err = dockerOutput("buildx", "build", "-o", "type=docker", "-t", "armada-airflow-operator-builder", "-f", "./build/airflow-operator/Dockerfile", ".")
+	err = dockerRun("buildx", "build", "-o", "type=docker", "-t", "armada-airflow-operator-builder", "-f", "./build/airflow-operator/Dockerfile", ".")
 	if err != nil {
 		return fmt.Errorf("failed to build Airflow Operator: %w", err)
 	}
 
-	_, err = dockerOutput("run", "--rm", "-v", "${PWD}/proto-airflow:/proto-airflow", "-v", "${PWD}:/go/src/armada", "-w", "/go/src/armada", "armada-airflow-operator-builder", "./scripts/build-airflow-operator.sh")
+	err = dockerRun("run", "--rm", "-v", "${PWD}/proto-airflow:/proto-airflow", "-v", "${PWD}:/go/src/armada", "-w", "/go/src/armada", "armada-airflow-operator-builder", "./scripts/build-airflow-operator.sh")
 	if err != nil {
 		return fmt.Errorf("failed to run build-airflow-operator.sh script: %w", err)
 	}

magefiles/main.go

@@ -236,7 +236,7 @@ func JunitReport() error {
 	}
 
 	// Make sure everything has been synced to disk
-	if err := sh.Run("sync"); err != nil {
+	if err := sh.RunV("sync"); err != nil {
 		return fmt.Errorf("failed to sync: %w", err)
 	}
 
@@ -252,7 +252,7 @@ func JunitReport() error {
 	}
 
 	if len(goTestCmd) == 0 {
-		if err = sh.RunV("bash", "-c", "cat test_reports/*.txt | go-junit-report > test_reports/junit.xml"); err != nil {
+		if err := sh.RunV("bash", "-c", "cat test_reports/*.txt | go-junit-report > test_reports/junit.xml"); err != nil {
 			return err
 		}
 	} else {
@@ -264,7 +264,7 @@ func JunitReport() error {
 	return nil
 }
 
-// Code generation tasks: statik, goimports, go generate. 
+// Code generation tasks: statik, goimports, go generate.
 func Generate() error {
 	go_cmd, err := go_CMD()
 	if err != nil {
@@ -310,3 +310,13 @@ func Generate() error {
 	}
 	return nil
 }
+
+// CI Image to build
+func BuildCI() error {
+	ciImage := []string{"server", "executor", "armadactl", "testsuite", "lookout", "lookoutingester", "lookoutv2", "lookoutingesterv2", "eventingester", "scheduler", "scheduleringester", "binoculars", "jobservice"}
+	err := goreleaserMinimalRelease(ciImage...)
+	if err != nil {
+		return err
+	}
+	return nil
+}