chore: fix release 1.4 ci job

Signed-off-by: suhan.zcy <[email protected]>
goharbor · Sep 25, 2024 · 408cc29 · 408cc29
1 parent 9d23a0a
commit 408cc29
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 12 deletions.
diff --git a/.github/scripts/apidb_test.sh b/.github/scripts/apidb_test.sh
@@ -34,4 +34,8 @@ df -h
 
 rm -rf $DOCKER_DATA_DIR
 
+mkdir -p /tmp/harbor
+# copy the e2e test reports and logs
+cp `pwd`/harbor/output.xml `pwd`/harbor/log.html `pwd`/harbor/report.html /tmp/harbor
+
 exit $rc
diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
@@ -59,7 +59,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Package charts
       run: make helm-generate
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: charts
         path: charts/*.tgz
diff --git a/.github/workflows/chart-tests.yml b/.github/workflows/chart-tests.yml
@@ -176,7 +176,7 @@ jobs:
           kubectl logs -l "release=harbor-redis" --all-containers > /tmp/harbor/redis.log
           ls -l /tmp/harbor
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
           name: harbor_chart
@@ -189,7 +189,7 @@ jobs:
           kind export logs --name harbor /tmp/logs
           ls -l /tmp/logs
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
           name: kind_chart

diff --git a/.github/workflows/contour-tests.yml b/.github/workflows/contour-tests.yml
@@ -198,7 +198,7 @@ jobs:
           kubectl -n cluster-sample-ns logs -l "app.kubernetes.io/component=redis" --all-containers > /tmp/harbor/redis.log
           ls -l /tmp/harbor
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
           name: contour_harbor_v${{ matrix.k8sVersion }}_v${{ matrix.certManager }}_${{ matrix.samples }}
@@ -211,7 +211,7 @@ jobs:
           kind export logs --name harbor /tmp/logs
           ls -l /tmp/logs
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
           name: contour_kind_v${{ matrix.k8sVersion }}_v${{ matrix.certManager }}_${{ matrix.samples }}

diff --git a/.github/workflows/harbor-e2e-tests.yml b/.github/workflows/harbor-e2e-tests.yml
@@ -181,7 +181,8 @@ jobs:
         docker pull $CORE_HOST/library/busybox:test
 
     - name: apidb test
-      run: bash .github/scripts/apidb_test.sh
+      run: |
+        bash .github/scripts/apidb_test.sh
       env:
         DOCKER_USER: ${{ secrets.DOCKER_USER }}
         DOCKER_PWD: ${{ secrets.DOCKER_TOKEN }}
@@ -201,7 +202,7 @@ jobs:
         kubectl -n cluster-sample-ns logs -l "app.kubernetes.io/component=redis" --all-containers > /tmp/harbor/redis.log
         ls -l /tmp/harbor
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
         name: harbor_v${{ matrix.k8sVersion }}_v${{ matrix.certManager }}_${{ matrix.samples }}
@@ -214,7 +215,7 @@ jobs:
         kind export logs --name harbor /tmp/logs
         ls -l /tmp/logs
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
         name: kind_v${{ matrix.k8sVersion }}_v${{ matrix.certManager }}_${{ matrix.samples }}

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -116,7 +116,7 @@ jobs:
           kind export logs --name harbor /tmp/logs
           ls -l /tmp/logs
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
           name: kind_go-tests

diff --git a/Makefile b/Makefile
@@ -139,7 +139,7 @@ helm-postgres-operator: helm $(CHARTS_DIRECTORY)/postgres-operator/values.yaml
 	$(MAKE) kube-namespace
 	$(HELM) repo add zalando https://opensource.zalando.com/postgres-operator/charts/postgres-operator
 	$(HELM) repo update
-	$(HELM) upgrade --namespace "$(NAMESPACE)" --install postgres-operator zalando/postgres-operator --version 1.7.0 -f $(CHARTS_DIRECTORY)/postgres-operator/values.yaml
+	$(HELM) upgrade --namespace "$(NAMESPACE)" --install postgres-operator zalando/postgres-operator --version 1.9.0 -f $(CHARTS_DIRECTORY)/postgres-operator/values.yaml
 
 helm-install: helm helm-generate helm-minio-operator helm-redis-operator helm-postgres-operator
 	$(MAKE) kube-namespace

diff --git a/charts/harbor-operator/Chart.lock b/charts/harbor-operator/Chart.lock
@@ -7,6 +7,6 @@ dependencies:
   version: 3.1.4
 - name: postgres-operator
   repository: https://opensource.zalando.com/postgres-operator/charts/postgres-operator
-  version: 1.7.0
+  version: 1.9.0
 digest: sha256:a457f468187c5ac3e0279e64e9a565335b0a5455400ccc818f29e4758c8074d0
 generated: "2023-02-22T10:57:46.632256448+01:00"
diff --git a/charts/harbor-operator/Chart.yaml b/charts/harbor-operator/Chart.yaml
@@ -33,7 +33,7 @@ dependencies:
   tags:
     - cache
 - name: postgres-operator
-  version: 1.7.0
+  version: 1.9.0
   condition: postgres-operator.enabled
   repository: https://opensource.zalando.com/postgres-operator/charts/postgres-operator
   tags:

diff --git a/manifests/samples/full_stack.yaml b/manifests/samples/full_stack.yaml
@@ -93,6 +93,7 @@ spec:
   internalTLS:
     enabled: true
   portal: {}
+  jobservice: {}
   registry:
     metrics:
       enabled: true

diff --git a/manifests/samples/minimal_stack_fs.yaml b/manifests/samples/minimal_stack_fs.yaml
@@ -84,6 +84,7 @@ spec:
   internalTLS:
     enabled: true
   portal: {}
+  jobservice: {}
   registry:
     metrics:
       enabled: true

diff --git a/manifests/samples/minimal_stack_incluster.yaml b/manifests/samples/minimal_stack_incluster.yaml
@@ -83,6 +83,7 @@ spec:
   internalTLS:
     enabled: true
   portal: {}
+  jobservice: {}
   registry:
     metrics:
       enabled: true

diff --git a/manifests/samples/standard_stack.yaml b/manifests/samples/standard_stack.yaml
@@ -231,6 +231,7 @@ spec:
   portal:
     templateAnnotations:
        foo: "bar"
+  jobservice: {}
   registry: {}
   trivy:
     skipUpdate: false

diff --git a/manifests/samples/standard_stack_fs.yaml b/manifests/samples/standard_stack_fs.yaml
@@ -141,6 +141,7 @@ spec:
   internalTLS:
     enabled: true
   portal: {}
+  jobservice: {}
   registry:
     metrics:
       enabled: true