H1 test

.github/dependabot.yml

@@ -0,0 +1,16 @@
+#To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/docker-tests.yml

@@ -1,8 +1,6 @@
 name: e2e test
 on:
   push:
-    branches:
-      - main
     paths-ignore:
       - '**/*.md'
   pull_request_target:
@@ -42,6 +40,8 @@ jobs:
         uses: hypertrace/github-actions/gradle@main
         with: 
           args: dockerBuildImages
+        env:
+          IMAGE_TAG: ${{ github.sha }}
 
       - name: Verify hypertrace image
         working-directory: ./.github/workflows/hypertrace-ingester
@@ -88,6 +88,8 @@ jobs:
         uses: hypertrace/github-actions/gradle@main
         with: 
           args: dockerBuildImages
+        env:
+          IMAGE_TAG: ${{ github.sha }}
 
       - name: Verify hypertrace image
         working-directory: ./.github/workflows/hypertrace-ingester

.github/workflows/pr-build.yml

@@ -1,24 +1,21 @@
 name: build and validate
 on:
   push:
-    branches:
-      - main
   pull_request_target:
     branches:
-      - main
-
+      - rzp_main
 jobs:
-  build:
+  validate-avros:
     runs-on: ubuntu-20.04
     steps:
-       # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
+      # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
       - name: Check out code
         uses: actions/checkout@v2.3.4
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
           fetch-depth: 0
-      
+
       - name: create checksum file
         uses: hypertrace/github-actions/checksum@main
 
@@ -31,24 +28,17 @@ jobs:
             gradle-packages-${{ runner.os }}-${{ github.job }}
             gradle-packages-${{ runner.os }}
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_READ_USER }}
-          password: ${{ secrets.DOCKERHUB_READ_TOKEN }}
-
-      - name: Build with Gradle
+      - name: validate avros
         uses: hypertrace/github-actions/gradle@main
-        with: 
-          args: build -x avroCompatibilityCheck dockerBuildImages
-
+        with:
+          args: avroCompatibilityCheck
   validate-helm-charts:
     runs-on: ubuntu-20.04
-    container: 
+    container:
       image: hypertrace/helm-gcs-packager:0.3.1
       credentials:
-        username: ${{ secrets.DOCKERHUB_READ_USER }}
-        password: ${{ secrets.DOCKERHUB_READ_TOKEN }}
+        username: ${{ secrets.PUBLIC_DOCKER_USERNAME }}
+        password: ${{ secrets.PUBLIC_DOCKER_PASSWORD }}
      # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
     steps:
       - name: Check out code
@@ -60,29 +50,10 @@ jobs:
 
       - name: validate charts
         run: ./.github/workflows/helm.sh validate
-
-  snyk-scan:
-    runs-on: ubuntu-20.04
-    steps:
-    # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
-      - name: Check out code
-        uses: actions/checkout@v2.3.4
-        with:
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-          fetch-depth: 0
-      - name: Setup snyk
-        uses: snyk/actions/setup@0.3.0
-      - name: Snyk test
-        run: snyk test --all-sub-projects --org=hypertrace --severity-threshold=low --policy-path=.snyk --configuration-matching='^runtimeClasspath$' --remote-repo-url='${{ github.server_url }}/${{ github.repository }}.git'
-        env:
-          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-          GRADLE_OPTS: -Dorg.gradle.workers.max=1
-
-  validate-avros:
+  build:
     runs-on: ubuntu-20.04
     steps:
-      # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
+       # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
       - name: Check out code
         uses: actions/checkout@v2.3.4
         with:
@@ -102,7 +73,42 @@ jobs:
             gradle-packages-${{ runner.os }}-${{ github.job }}
             gradle-packages-${{ runner.os }}
 
-      - name: validate avros
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.PUBLIC_DOCKER_USERNAME }}
+          password: ${{ secrets.PUBLIC_DOCKER_PASSWORD }}
+
+      - name: Build with Gradle
         uses: hypertrace/github-actions/gradle@main
         with:
-          args: avroCompatibilityCheck
+          args: build dockerBuildImages
+        env:
+          IMAGE_TAG: ${{ github.sha }}
+
+      - name: push docker image
+        uses: hypertrace/github-actions/gradle@main
+        with:
+          args: dockerPushImages
+        env:
+          DOCKER_USERNAME: ${{ secrets.PUBLIC_DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.PUBLIC_DOCKER_PASSWORD }}
+          IMAGE_TAG: ${{ github.sha }}
+
+#   snyk-scan:
+#     runs-on: ubuntu-20.04
+#     steps:
+#     # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
+#       - name: Check out code
+#         uses: actions/checkout@v2.3.4
+#         with:
+#           ref: ${{github.event.pull_request.head.ref}}
+#           repository: ${{github.event.pull_request.head.repo.full_name}}
+#           fetch-depth: 0
+#       - name: Setup snyk
+#         uses: snyk/actions/setup@0.3.0
+#       - name: Snyk test
+#         run: snyk test --all-sub-projects --org=hypertrace --severity-threshold=low --policy-path=.snyk --configuration-matching='^runtimeClasspath$' --remote-repo-url='${{ github.server_url }}/${{ github.repository }}.git'
+#         env:
+#           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+#           GRADLE_OPTS: -Dorg.gradle.workers.max=1

.github/workflows/pr-test.yml

@@ -1,20 +1,20 @@
 name: test
 on:
   push:
+  pull_request_target:
     branches:
-      - main
-  pull_request:
-
+      - rzp_main
+# disabling while testing ci flow
 jobs:
   test:
     runs-on: ubuntu-20.04
     steps:
-       # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
+      # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
       - name: Check out code
         uses: actions/checkout@v2.3.4
         with:
           fetch-depth: 0
-      
+
       - name: create checksum file
         uses: hypertrace/github-actions/checksum@main
 
@@ -29,7 +29,7 @@ jobs:
 
       - name: Unit test
         uses: hypertrace/github-actions/gradle@main
-        with: 
+        with:
           args: jacocoTestReport
 
       - name: Upload coverage to Codecov
@@ -38,9 +38,10 @@ jobs:
           name: unit test reports
           flags: unit
 
+
       - name: copy test reports
         uses: hypertrace/github-actions/gradle@main
-        with: 
+        with:
           args: copyAllReports --output-dir=/tmp/test-reports
 
       - name: Archive test reports
@@ -49,10 +50,10 @@ jobs:
           name: test-reports
           path: /tmp/test-reports
         if: always()
-     
+
       - name: Publish Unit Test Results
         uses: docker://ghcr.io/enricomi/publish-unit-test-result-action:v1.6
         if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          files: ./**/build/test-results/**/*.xml
+          files: ./**/build/test-results/**/*.xml