[test] 2008 move gitjob with history

.drone.yml

@@ -107,6 +107,26 @@ steps:
     - refs/tags/*
     event:
     - tag
+- name: docker-publish-gitjob
+  image: plugins/docker
+  settings:
+    dockerfile: package/Dockerfile.gitjob
+    password:
+      from_secret: docker_password
+    repo: "rancher/fleet-gitjob"
+    tag: "${DRONE_TAG}-linux-amd64"
+    username:
+      from_secret: docker_username
+    build_args:
+      - "ARCH=amd64"
+  when:
+    instance:
+    - drone-publish.rancher.io
+    ref:
+    - refs/head/master
+    - refs/tags/*
+    event:
+    - tag
 - name: docker-publish
   image: plugins/docker
   settings:
@@ -191,6 +211,26 @@ steps:
     - refs/tags/*
     event:
     - tag
+- name: docker-publish-gitjob
+  image: plugins/docker
+  settings:
+    dockerfile: package/Dockerfile.gitjob
+    password:
+      from_secret: docker_password
+    repo: "rancher/fleet-gitjob"
+    tag: "${DRONE_TAG}-linux-arm64"
+    username:
+      from_secret: docker_username
+    build_args:
+      - "ARCH=arm64"
+  when:
+    instance:
+    - drone-publish.rancher.io
+    ref:
+    - refs/head/master
+    - refs/tags/*
+    event:
+    - tag
 - name: docker-publish
   image: plugins/docker
   settings:
@@ -339,6 +379,22 @@ steps:
     - refs/tags/*
     event:
     - tag
+- name: manifest-gitjob
+  image: plugins/manifest:1.0.2
+  settings:
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    spec: manifest-gitjob.tmpl
+  when:
+    instance:
+    - drone-publish.rancher.io
+    ref:
+    - refs/head/master
+    - refs/tags/*
+    event:
+    - tag
 - name: manifest-agent
   image: plugins/manifest:1.0.2
   settings:

.github/scripts/build-fleet-binaries.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+# Description: build fleet binary and image with debug flags
+
+set -euxo pipefail
+
+if [ ! -d ./cmd/fleetcontroller ]; then
+  echo "please change the current directory to the fleet repo checkout"
+  exit 1
+fi
+
+export GOARCH="${GOARCH:-amd64}"
+export CGO_ENABLED=0
+
+# re-generate code
+if ! git diff --quiet HEAD origin/master --  pkg/apis/fleet.cattle.io/v1alpha1; then
+  go generate
+fi
+
+export GOOS=linux
+# fleet
+go build -gcflags='all=-N -l' -o bin/fleetcontroller-linux-"$GOARCH" ./cmd/fleetcontroller
+
+# fleet agent
+go build -gcflags='all=-N -l' -o "bin/fleet-linux-$GOARCH" ./cmd/fleetcli
+go build -gcflags='all=-N -l' -o "bin/fleetagent-linux-$GOARCH" ./cmd/fleetagent
+
+# gitjob
+go build -gcflags='all=-N -l' -o "bin/gitcloner" ./cmd/gitcloner
+go build -gcflags='all=-N -l' -o "bin/gitjob" ./cmd/gitjob

.github/scripts/build-fleet-images.sh

@@ -0,0 +1,5 @@
+export GOARCH="${GOARCH:-amd64}"
+
+docker build -f package/Dockerfile -t rancher/fleet:dev --build-arg="ARCH=$GOARCH"  .
+docker build -f package/Dockerfile.agent -t rancher/fleet-agent:dev --build-arg="ARCH=$GOARCH" .
+docker build -f package/Dockerfile.gitjob -t rancher/fleet-gitjob:dev --build-arg="ARCH=$GOARCH" .

.github/scripts/release-against-charts.sh

@@ -10,11 +10,7 @@ PREV_CHART_VERSION="$3"   # e.g. 101.2.0
 NEW_CHART_VERSION="$4"
 REPLACE="$5"              # remove previous version if `true`, otherwise add new
 
-if [ -z "${GITHUB_WORKSPACE:-}" ]; then
-    CHARTS_DIR="$(dirname -- "$0")/../../../charts"
-else
-    CHARTS_DIR="${GITHUB_WORKSPACE}/charts"
-fi
+CHARTS_DIR=${CHARTS_DIR-"$(dirname -- "$0")/../../../charts"}
 
 pushd "${CHARTS_DIR}" > /dev/null
 
@@ -53,4 +49,4 @@ PACKAGE=fleet make charts
 git add assets/fleet* charts/fleet* index.yaml
 git commit -m "Autogenerated changes for Fleet v${NEW_FLEET_VERSION}"
 
-popd > /dev/null
+popd > /dev/null

.github/scripts/release-against-rancher.sh

@@ -15,11 +15,7 @@ bump_fleet_api() {
     go mod tidy
 }
 
-if [ -z "${GITHUB_WORKSPACE:-}" ]; then
-    CHARTS_DIR="$(dirname -- "$0")/../../../rancher"
-else
-    CHARTS_DIR="${GITHUB_WORKSPACE}/rancher"
-fi
+CHARTS_DIR=${CHARTS_DIR-"$(dirname -- "$0")/../../../rancher"}
 
 pushd "${CHARTS_DIR}" > /dev/null
 
@@ -54,4 +50,4 @@ fi
 
 git commit -m "Updating to Fleet v${NEW_FLEET_VERSION}"
 
-popd > /dev/null
+popd > /dev/null

.github/workflows/aks.yml

@@ -76,10 +76,7 @@ jobs:
       -
         name: Build fleet binaries
         run: |
-          go build -o bin/fleetcontroller-linux-$GOARCH ./cmd/fleetcontroller
-
-          go build -o "bin/fleet-linux-$GOARCH" ./cmd/fleetcli
-          go build -o "bin/fleetagent-linux-$GOARCH" ./cmd/fleetagent
+          ./.github/scripts/build-fleet-binaries.sh
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3

.github/workflows/check-changes.yml

@@ -25,9 +25,6 @@ jobs:
       -
         name: go.mod
         run: ./.github/scripts/check-for-go-mod-changes.sh
-      -
-        name: gitjob
-        run: ./.github/scripts/check-for-gitjob-changes.sh
       -
         name: generate.go
         run: ./.github/scripts/check-for-auto-generated-changes.sh

.github/workflows/e2e-ci.yml

@@ -45,17 +45,15 @@ jobs:
       -
         name: Build Fleet Binaries
         run: |
-          go build -o bin/fleetcontroller-linux-$GOARCH ./cmd/fleetcontroller
+          ./.github/scripts/build-fleet-binaries.sh
 
-          go build -o "bin/fleet-linux-$GOARCH" ./cmd/fleetcli
-          go build -o "bin/fleetagent-linux-$GOARCH" ./cmd/fleetagent
           cd e2e/testenv/infra
           go build -o . ./...
       -
         name: Build Docker Images
         run: |
-          docker build -f package/Dockerfile -t rancher/fleet:dev --build-arg="ARCH=$GOARCH" .
-          docker build -f package/Dockerfile.agent -t rancher/fleet-agent:dev --build-arg="ARCH=$GOARCH" .
+          ./.github/scripts/build-fleet-images.sh
+
           cd e2e/assets/gitrepo
           # Buildkit needed here for proper here-document support
           DOCKER_BUILDKIT=1 docker build -f Dockerfile.gitserver -t nginx-git:test --build-arg="passwd=$(openssl passwd foo)" .
@@ -73,7 +71,7 @@ jobs:
       -
         name: Import Images Into k3d
         run: |
-          ./.github/scripts/k3d-import-retry.sh rancher/fleet:dev rancher/fleet-agent:dev nginx-git:test
+          ./.github/scripts/k3d-import-retry.sh rancher/fleet:dev rancher/fleet-agent:dev rancher/fleet-gitjob:dev nginx-git:test
       -
         name: Set Up Tmate Debug Session
         if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.enable_tmate == 'true' }}
@@ -155,6 +153,13 @@ jobs:
           echo "${{ secrets.CI_SSH_PUBKEY }}" > "$GIT_SSH_PUBKEY"
 
           ginkgo e2e/require-secrets
+
+          export GIT_GITJOB_SSH_KEY="$GITHUB_WORKSPACE/id_ed25519"
+          export GIT_GITJOB_SSH_PUBKEY="$GITHUB_WORKSPACE/id_ed25519.pub"
+          echo "${{ secrets.CI_GITJOB_SSH_KEY }}" > "$GIT_GITJOB_SSH_KEY"
+          echo "${{ secrets.CI_GITJOB_SSH_PUBKEY }}" > "$GIT_GITJOB_SSH_PUBKEY"
+
+          ginkgo e2e/gitjob
       -
         name: Dump Failed Environment
         if: failure()

.github/workflows/e2e-multicluster-ci.yml

@@ -40,15 +40,11 @@ jobs:
       -
         name: Build Fleet Binaries
         run: |
-          go build -o bin/fleetcontroller-linux-$GOARCH ./cmd/fleetcontroller
-
-          go build -o "bin/fleet-linux-$GOARCH" ./cmd/fleetcli
-          go build -o "bin/fleetagent-linux-$GOARCH" ./cmd/fleetagent
+          ./.github/scripts/build-fleet-binaries.sh
       -
         name: Build Docker Images
         run: |
-          docker build -f package/Dockerfile -t rancher/fleet:dev --build-arg="ARCH=$GOARCH" .
-          docker build -f package/Dockerfile.agent -t rancher/fleet-agent:dev --build-arg="ARCH=$GOARCH" .
+          ./.github/scripts/build-fleet-images.sh
       -
         name: Provision k3d Cluster
         uses: AbsaOSS/k3d-action@v2
@@ -76,7 +72,7 @@ jobs:
       -
         name: Import Images Into k3d
         run: |
-          ./.github/scripts/k3d-import-retry.sh rancher/fleet:dev rancher/fleet-agent:dev -c upstream
+          ./.github/scripts/k3d-import-retry.sh rancher/fleet:dev rancher/fleet-agent:dev rancher/fleet-gitjob:dev -c upstream
           ./.github/scripts/k3d-import-retry.sh rancher/fleet-agent:dev -c downstream
       -
         name: Set Up Tmate Debug Session

.github/workflows/eks.yml

@@ -90,10 +90,7 @@ jobs:
       -
         name: Build fleet binaries
         run: |
-          go build -o bin/fleetcontroller-linux-$GOARCH ./cmd/fleetcontroller
-
-          go build -o "bin/fleet-linux-$GOARCH" ./cmd/fleetcli
-          go build -o "bin/fleetagent-linux-$GOARCH" ./cmd/fleetagent
+          ./.github/scripts/build-fleet-binaries.sh
       -
         name: Get UUID
         id: uuid

.github/workflows/fleet-upgrade.yml

@@ -66,19 +66,15 @@ jobs:
       -
         name: Build Fleet Binaries
         run: |
-          go build -o bin/fleetcontroller-linux-$GOARCH ./cmd/fleetcontroller
-
-          go build -o "bin/fleet-linux-$GOARCH" ./cmd/fleetcli
-          go build -o "bin/fleetagent-linux-$GOARCH" ./cmd/fleetagent
+          ./.github/scripts/build-fleet-binaries.sh
       -
         name: Build Docker Images
         run: |
-          docker build -f package/Dockerfile -t rancher/fleet:dev --build-arg="ARCH=$GOARCH" .
-          docker build -f package/Dockerfile.agent -t rancher/fleet-agent:dev --build-arg="ARCH=$GOARCH" .
+          ./.github/scripts/build-fleet-images.sh
       -
         name: Import Images Into k3d
         run: |
-          ./.github/scripts/k3d-import-retry.sh rancher/fleet:dev rancher/fleet-agent:dev -c upstream
+          ./.github/scripts/k3d-import-retry.sh rancher/fleet:dev rancher/fleet-agent:dev rancher/fleet-gitjob:dev -c upstream
       -
         name: Verify Example Workload
         run: |

.github/workflows/gke.yml

@@ -81,10 +81,7 @@ jobs:
       -
         name: Build fleet binaries
         run: |
-          go build -o bin/fleetcontroller-linux-$GOARCH ./cmd/fleetcontroller
-
-          go build -o "bin/fleet-linux-$GOARCH" ./cmd/fleetcli
-          go build -o "bin/fleetagent-linux-$GOARCH" ./cmd/fleetagent
+          ./.github/scripts/build-fleet-binaries.sh
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3

.github/workflows/nightly-ci.yml

@@ -48,17 +48,15 @@ jobs:
       -
         name: Build Fleet Binaries
         run: |
-          go build -o bin/fleetcontroller-linux-$GOARCH ./cmd/fleetcontroller
+          ./.github/scripts/build-fleet-binaries.sh
 
-          go build -o "bin/fleet-linux-$GOARCH" ./cmd/fleetcli
-          go build -o "bin/fleetagent-linux-$GOARCH" ./cmd/fleetagent
           cd e2e/testenv/infra
           go build -o . ./...
       -
         name: Build Docker Images
         run: |
-          docker build -f package/Dockerfile -t rancher/fleet:dev --build-arg="ARCH=$GOARCH" .
-          docker build -f package/Dockerfile.agent -t rancher/fleet-agent:dev --build-arg="ARCH=$GOARCH" .
+          ./.github/scripts/build-fleet-images.sh
+
           DOCKER_BUILDKIT=1 docker build -f e2e/assets/gitrepo/Dockerfile.gitserver -t nginx-git:test --build-arg="passwd=$(openssl passwd foo)" e2e/assets/gitrepo
       -
         name: Provision k3d Cluster
@@ -74,7 +72,7 @@ jobs:
       -
         name: Import Images Into k3d
         run: |
-          ./.github/scripts/k3d-import-retry.sh rancher/fleet:dev rancher/fleet-agent:dev nginx-git:test
+          ./.github/scripts/k3d-import-retry.sh rancher/fleet:dev rancher/fleet-agent:dev rancher/fleet-gitjob:dev nginx-git:test
       -
         name: Set Up Tmate Debug Session
         if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.enable_tmate == 'true' }}
@@ -152,6 +150,7 @@ jobs:
           echo "${{ secrets.CI_SSH_PUBKEY }}" > "$GIT_SSH_PUBKEY"
 
           ginkgo e2e/require-secrets
+          ginkgo e2e/gitjob
       -
         name: Dump Failed Environment
         if: failure()

.github/workflows/nightly.yml

@@ -53,13 +53,9 @@ jobs:
           GOOS: linux
         run: |
           export GOARCH=amd64
-          go build -gcflags='all=-N -l' -o bin/fleetcontroller-linux-amd64 ./cmd/fleetcontroller
-          go build -gcflags='all=-N -l' -o bin/fleet-linux-amd64 ./cmd/fleetcli
-          go build -gcflags='all=-N -l' -o bin/fleetagent-linux-amd64 ./cmd/fleetagent
+          ./.github/scripts/build-fleet-binaries.sh
           export GOARCH=arm64
-          go build -gcflags='all=-N -l' -o bin/fleetcontroller-linux-arm64 ./cmd/fleetcontroller
-          go build -gcflags='all=-N -l' -o bin/fleet-linux-arm64 ./cmd/fleetcli
-          go build -gcflags='all=-N -l' -o bin/fleetagent-linux-arm64 ./cmd/fleetagent
+          ./.github/scripts/build-fleet-binaries.sh
       -
         id: meta-fleet
         uses: docker/metadata-action@v5

.github/workflows/rancher-integration.yml

@@ -63,10 +63,7 @@ jobs:
       -
         name: Build fleet binaries
         run: |
-          go build -o bin/fleetcontroller-linux-$GOARCH ./cmd/fleetcontroller
-
-          go build -o "bin/fleet-linux-$GOARCH" ./cmd/fleetcli
-          go build -o "bin/fleetagent-linux-$GOARCH" ./cmd/fleetagent
+          ./.github/scripts/build-fleet-binaries.sh
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3

.github/workflows/release-against-charts.yml

@@ -50,7 +50,9 @@ jobs:
       - name: Install dependencies
         run: sudo snap install yq --channel=v4/stable
       - name: Run release script
-        run: ./fleet/.github/scripts/release-against-charts.sh ${{github.event.inputs.prev_fleet}} ${{github.event.inputs.new_fleet}} ${{github.event.inputs.prev_chart}}  ${{github.event.inputs.new_chart}}  ${{github.event.inputs.should_replace}}
+        run: |
+          export CHARTS_DIR="${GITHUB_WORKSPACE}/charts"
+          ./fleet/.github/scripts/release-against-charts.sh ${{github.event.inputs.prev_fleet}} ${{github.event.inputs.new_fleet}} ${{github.event.inputs.prev_chart}}  ${{github.event.inputs.new_chart}}  ${{github.event.inputs.should_replace}}
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v5
         with:

.github/workflows/release-against-rancher.yml

@@ -48,7 +48,9 @@ jobs:
         with:
           go-version: ${{ env.SETUP_GO_VERSION }}
       - name: Run release script
-        run: ./fleet/.github/scripts/release-against-rancher.sh ${{github.event.inputs.new_fleet}} ${{github.event.inputs.new_chart}} ${{github.event.inputs.should_bump_api}}
+        run: |
+          export CHARTS_DIR="${GITHUB_WORKSPACE}/rancher"
+          ./fleet/.github/scripts/release-against-rancher.sh ${{github.event.inputs.new_fleet}} ${{github.event.inputs.new_chart}} ${{github.event.inputs.should_bump_api}}
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v5
         with: