Merge remote-tracking branch 'origin/2.11.x' into 2.11.x

# Conflicts:
#	.github/workflows/build-snapshot-worker.yml
#	.github/workflows/ci-it-security.yml
#	.github/workflows/ci-pr.yml
#	.github/workflows/schedule-train-builds.yml

.github/workflows/build-snapshot-worker.yml

@@ -42,6 +42,7 @@ jobs:
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-m2-
+
     - name: Login dockerhub
       uses: docker/login-action@v3
       with:

.github/workflows/ci-it-security.yml

@@ -24,6 +24,7 @@ jobs:
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
+
     - name: Run Security IT
       run: |
         mvn \

.github/workflows/ci-pr.yml

@@ -3,47 +3,30 @@ name: CI PRs
 on:
   pull_request:
 
+env:
+  MAVEN_THREADS: '-T 1'
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    # cache maven repo
     - uses: jlumbroso/free-disk-space@main
       with:
         tool-cache: false
         dotnet: false
         docker-images: false
         swap-storage: false
         large-packages: false
-    # jdk8
     - uses: actions/setup-java@v3
       with:
         java-version: '8'
         distribution: 'liberica'
-    - uses: jvalkeal/setup-maven@v1
-      with:
-        maven-version: 3.8.8
-        maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/'
-    - name: Login dockerhub
-      uses: docker/login-action@v3
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
-    # build
     - name: Build
       shell: bash
       timeout-minutes: 75
       run: |
-        mvn -B -s .github/settings.xml clean install
-    - name: Test Report
-      uses: dorny/test-reporter@v1
-      if: ${{ success() || failure() }}
-      with:
-        name: Unit Tests
-        path: '**/surefire-reports/*.xml'
-        reporter: java-junit
-        list-tests: failed
+        ./mvnw -B -s .github/settings.xml clean install
     - name: Capture Test Results
       if: failure()
       uses: actions/upload-artifact@v3

.github/workflows/schedule-train-builds.yml

@@ -10,8 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        branch: [2.11.x]
-        # branch: [main, 2.11.x] # resume when main is 3.x
+        branch: [main, 2.10.x]
     steps:
     - uses: benc-uk/workflow-dispatch@v1
       with:

src/deploy/carvel/deploy-scdf.sh

@@ -111,6 +111,13 @@ fi
 "$SCDIR/carvel-import-secret.sh" "scdfmetadata" "$NS"
 "$SCDIR/carvel-import-secret.sh" "reg-creds-dockerhub" "$NS"
 
+if [ "$SCDF_TYPE" = "pro" ]; then
+    "$SCDIR/carvel-import-secret.sh" "reg-creds-dev-registry" "$NS"
+fi
+
+"$SCDIR/carvel-import-secret.sh" "scdfmetadata" "$NS"
+"$SCDIR/carvel-import-secret.sh" "reg-creds-dockerhub" "$NS"
+
 if [ "$SCDF_TYPE" = "pro" ]; then
     "$SCDIR/carvel-import-secret.sh" "reg-creds-dev-registry" "$NS"
 fi