Asfa mumtaz patch 2

.github/workflows/render_task.yaml

@@ -22,6 +22,10 @@ concurrency:
 jobs:
   render_and_replace:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false  # Set to false to retry the entire job even if one job fails
+      matrix:
+        retry-max: [1, 2, 3]  
 
     steps:
       - name: Checkout Repository
@@ -49,7 +53,19 @@ jobs:
         run: |
           sed -i 's/ClusterTask/Task/g' ${{ inputs.SUBPATH }}/rendered/${{ inputs.SUBPATH }}-${{ inputs.NEXT_VERSION }}.yaml
           sed -i -E 's/${{ inputs.SUBPATH }}-[0-9]+\.[0-9]+\.[0-9]+/${{ inputs.SUBPATH }}-${{ inputs.NEXT_VERSION }}/g' ${{ inputs.SUBPATH }}/rendered/${{ inputs.SUBPATH }}-${{ inputs.NEXT_VERSION }}.yaml
-
+      - name: Git pull
+        run: |
+          # Ensure you are on the correct branch
+          git checkout main  # Replace "main" with your branch name
+
+          # Fetch the latest changes from the remote repository
+          git fetch origin main:main
+
+          # Merge the fetched changes into your local branch
+          git merge origin/main
+
+          # Optionally, resolve any merge conflicts if needed
+          # git commit -m "Merge remote changes" -a
       - name: Commit Changes
         run: |
           git config --global user.email "[email protected]"
@@ -58,6 +74,7 @@ jobs:
           git commit -m "[skip ci] Add rendered and modified Helm chart"
           git pull
 
+
       - name: Push changes
         uses: ad-m/github-push-action@master
         with:

.github/workflows/stakater_buildah.yaml

@@ -13,102 +13,102 @@ on:
     - 'stakater-buildah/**'
 
 jobs:
-  clustertask-test-run:
-    name: ClusterTask Test Run on SNO
-    runs-on: self-hosted
-    if: github.event_name == 'pull_request' && github.ref != 'refs/heads/main' 
-
-    steps:
-    - name: Check out code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-        ref: ${{github.event.pull_request.head.sha}}
-
-    - name: Install CLI tools from OpenShift Mirror
-      uses: redhat-actions/openshift-tools-installer@v1
-      with:
-        oc: "4"
-
-    # This is used to setup kubeconfig, required by Tilt 
-    - name: Login to cluster
-      run: oc login --token=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token) --server=https://kubernetes.default.svc --insecure-skip-tls-verify=true
-
-    - name: Set up Helm
-      uses: azure/setup-helm@v3
-      with:
-        version: v3.8.2
-
-    # This is required for login to ghcr helm registry
-    - name: Login to Container Registry
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io/stakater
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Install kubectl
-      uses: azure/setup-kubectl@v3
-      with:
-        version: v1.26.0
-
-    - name: Install tilt
-      run: curl -fsSL https://raw.githubusercontent.com/tilt-dev/tilt/master/scripts/install.sh | bash
-
-    - name: Tilt CI - Setup Dependencies
-      run: tilt ci -f .github/Tiltfile-setup-dependencies
-
-    - name: Tilt CI - Run Clustertask 
-      env: 
-        TEST_GIT_REPO_SECRET: ${{ secrets.TEKTON_CATALOG_ARC_CLUSTERTASK_TOKEN }}
-        # Token created with stakater-user. Expires on Thu, Jun 29 2023.
-      run: tilt ci -f stakater-buildah/tests/Tiltfile-clustertask
-
-    - name: Tilt down - Clustertask
-      if: always()
-      run: tilt down -f stakater-buildah/tests/Tiltfile-delete-clustertask
-
-    - name: Tilt down - Dependencies
-      if: always()
-      run: tilt down -f .github/Tiltfile-delete-dependencies --delete-namespaces
+  # clustertask-test-run:
+  #   name: ClusterTask Test Run on SNO
+  #   runs-on: self-hosted
+  #   if: github.event_name == 'pull_request' && github.ref != 'refs/heads/main' 
+
+  #   steps:
+  #   - name: Check out code
+  #     uses: actions/checkout@v3
+  #     with:
+  #       fetch-depth: 0
+  #       ref: ${{github.event.pull_request.head.sha}}
+
+  #   - name: Install CLI tools from OpenShift Mirror
+  #     uses: redhat-actions/openshift-tools-installer@v1
+  #     with:
+  #       oc: "4"
+
+  #   # This is used to setup kubeconfig, required by Tilt 
+  #   - name: Login to cluster
+  #     run: oc login --token=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token) --server=https://kubernetes.default.svc --insecure-skip-tls-verify=true
+
+  #   - name: Set up Helm
+  #     uses: azure/setup-helm@v3
+  #     with:
+  #       version: v3.8.2
+
+  #   # This is required for login to ghcr helm registry
+  #   - name: Login to Container Registry
+  #     uses: docker/login-action@v2
+  #     with:
+  #       registry: ghcr.io/stakater
+  #       username: ${{ github.actor }}
+  #       password: ${{ secrets.GITHUB_TOKEN }}
+
+  #   - name: Install kubectl
+  #     uses: azure/setup-kubectl@v3
+  #     with:
+  #       version: v1.26.0
+
+  #   - name: Install tilt
+  #     run: curl -fsSL https://raw.githubusercontent.com/tilt-dev/tilt/master/scripts/install.sh | bash
+
+  #   - name: Tilt CI - Setup Dependencies
+  #     run: tilt ci -f .github/Tiltfile-setup-dependencies
+
+  #   - name: Tilt CI - Run Clustertask 
+  #     env: 
+  #       TEST_GIT_REPO_SECRET: ${{ secrets.TEKTON_CATALOG_ARC_CLUSTERTASK_TOKEN }}
+  #       # Token created with stakater-user. Expires on Thu, Jun 29 2023.
+  #     run: tilt ci -f stakater-buildah/tests/Tiltfile-clustertask
+
+  #   - name: Tilt down - Clustertask
+  #     if: always()
+  #     run: tilt down -f stakater-buildah/tests/Tiltfile-delete-clustertask
+
+  #   - name: Tilt down - Dependencies
+  #     if: always()
+  #     run: tilt down -f .github/Tiltfile-delete-dependencies --delete-namespaces
   next-version:
     uses: stakater/tekton-catalog/.github/workflows/next_version.yaml@main
     with:
       component: stakater-buildah
 
-  pull-request:
-    uses: stakater/tekton-catalog/.github/workflows/pull_request.yaml@main
-    name: Pull Request
-    if: ${{ github.ref != 'refs/heads/main' }}
-    needs:
-    - next-version
-    secrets:
-      REGISTRY_USERNAME: ${{ github.actor }}
-      REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-    with:
-      CONTAINER_REGISTRY_URL: ghcr.io/stakater
-      HELM_REGISTRY_URL: oci://ghcr.io/stakater/charts
-      SUBPATH: stakater-buildah
-      PUSH_CONTAINER_IMAGE: ${{ needs.next-version.outputs.dockerfile_exists }}
-      PUBLISH_HEM_CHART: ${{ needs.next-version.outputs.helm_chart_exists }}
-      NEXT_VERSION: ${{ needs.next-version.outputs.version }}
-
-  push-and-release:
-    uses: stakater/tekton-catalog/.github/workflows/push.yaml@main
-    name: Push and Release
-    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-    needs:
-    - next-version
-    secrets:
-      REGISTRY_USERNAME: ${{ github.actor }}
-      REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-    with:
-      CONTAINER_REGISTRY_URL: ghcr.io/stakater
-      HELM_REGISTRY_URL: oci://ghcr.io/stakater/charts
-      SUBPATH: stakater-buildah
-      PUSH_CONTAINER_IMAGE: ${{ needs.next-version.outputs.dockerfile_exists }}
-      PUBLISH_HEM_CHART: ${{ needs.next-version.outputs.helm_chart_exists }}
-      NEXT_VERSION: ${{ needs.next-version.outputs.version }}
+  # pull-request:
+  #   uses: stakater/tekton-catalog/.github/workflows/pull_request.yaml@main
+  #   name: Pull Request
+  #   if: ${{ github.ref != 'refs/heads/main' }}
+  #   needs:
+  #   - next-version
+  #   secrets:
+  #     REGISTRY_USERNAME: ${{ github.actor }}
+  #     REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+  #   with:
+  #     CONTAINER_REGISTRY_URL: ghcr.io/stakater
+  #     HELM_REGISTRY_URL: oci://ghcr.io/stakater/charts
+  #     SUBPATH: stakater-buildah
+  #     PUSH_CONTAINER_IMAGE: ${{ needs.next-version.outputs.dockerfile_exists }}
+  #     PUBLISH_HEM_CHART: ${{ needs.next-version.outputs.helm_chart_exists }}
+  #     NEXT_VERSION: ${{ needs.next-version.outputs.version }}
+
+  # push-and-release:
+  #   uses: stakater/tekton-catalog/.github/workflows/push.yaml@main
+  #   name: Push and Release
+  #   if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+  #   needs:
+  #   - next-version
+  #   secrets:
+  #     REGISTRY_USERNAME: ${{ github.actor }}
+  #     REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+  #   with:
+  #     CONTAINER_REGISTRY_URL: ghcr.io/stakater
+  #     HELM_REGISTRY_URL: oci://ghcr.io/stakater/charts
+  #     SUBPATH: stakater-buildah
+  #     PUSH_CONTAINER_IMAGE: ${{ needs.next-version.outputs.dockerfile_exists }}
+  #     PUBLISH_HEM_CHART: ${{ needs.next-version.outputs.helm_chart_exists }}
+  #     NEXT_VERSION: ${{ needs.next-version.outputs.version }}
 
   render-and-replace:
     uses: stakater/tekton-catalog/.github/workflows/render_task.yaml@main
@@ -117,7 +117,7 @@ jobs:
     needs:
       - next-version
     secrets:
-      STAKATER_GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
+      STAKATER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     with:
       SUBPATH: stakater-buildah
       NEXT_VERSION: ${{ needs.next-version.outputs.version }}