update a lot

PaddlePaddle · Jul 4, 2022 · 648e351 · 648e351
1 parent 868360c
commit 648e351
Show file tree

Hide file tree

Showing 33 changed files with 913 additions and 381 deletions.
diff --git a/tekton/cronjobs/build-image-triggers.yaml b/tekton/cronjobs/build-image-triggers.yaml
@@ -1,4 +1,4 @@
-apiVersion: triggers.tekton.dev/v1beta1
+apiVersion: triggers.tekton.dev/v1alpha1
 kind: EventListener
 metadata:
   name: cron-listener
@@ -38,20 +38,24 @@ spec:
       serviceAccountName: tekton-triggers-example-sa
       pipelineRef:
         name: build-multi-image
+      podTemplate:
+        hostNetwork: true
       workspaces:
       # Temporary volume which will be deleted when the pipeline finishes.
-      - name: shared-data
-        volumeClaimTemplate:
-          spec:
-            accessModes:
-            - ReadWriteOnce
-            resources:
-              requests:
-                storage: 10Gi
-    # Cache space for kaniko
-      - name: cache
-        persistentVolumeClaim:
-          claimName: pvc-kaniko-cache
+        - name: shared-data
+          volumeClaimTemplate:
+            spec:
+              storageClassName: manual
+              accessModes:
+              - ReadWriteOnce
+              resources:
+                requests:
+                  storage: 15Gi
+      # Cache space for kaniko
+        - name: cache
+          persistentVolumeClaim:
+            claimName: pvc-kaniko-cache
+      timeout: 7h
       params:
       - name: image-dockerhub-registry
         value: $(tt.params.image-dockerhub-registry)
@@ -72,7 +76,6 @@ spec:
       - name: dockerfile-path
         value: $(tt.params.dockerfile-path)
 
-
 ---
 apiVersion: triggers.tekton.dev/v1beta1
 kind: TriggerBinding

diff --git a/tekton/cronjobs/cleanup.yaml b/tekton/cronjobs/cleanup.yaml
@@ -1,9 +1,11 @@
-apiVersion: batch/v1
+apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: cleanup-cronjob
 spec:
-  schedule: "*/18 0 * * *"       # Cron Time
+  schedule: "*/5 0 * * *"       # Cron Time
+  successfulJobsHistoryLimit: 0
+  failedJobsHistoryLimit: 0
   jobTemplate:
     spec:
       template:

diff --git a/tekton/cronjobs/curl/paddleclas.yaml b/tekton/cronjobs/curl/paddleclas.yaml
@@ -1,9 +1,11 @@
-apiVersion: batch/v1
+apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: cronjob-curl-paddleclas
 spec:
-  schedule: "*/0 0 * * 5"          # UTC 18:00 CST 24:00
+  schedule: "*/1 0 * * 5"          
+  successfulJobsHistoryLimit: 0
+  failedJobsHistoryLimit: 0
   jobTemplate:
     spec:
       template:

diff --git a/tekton/cronjobs/curl/paddledetection.yaml b/tekton/cronjobs/curl/paddledetection.yaml
@@ -1,9 +1,11 @@
-apiVersion: batch/v1
+apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: cronjob-curl-paddledetection
 spec:
-  schedule: "*/0 0 * * 2"          # UTC 18:00 CST 24:00
+  schedule: "*/1 0 * * 2"          
+  successfulJobsHistoryLimit: 0
+  failedJobsHistoryLimit: 0  
   jobTemplate:
     spec:
       template:

diff --git a/tekton/cronjobs/curl/paddlehelix.yaml b/tekton/cronjobs/curl/paddlehelix.yaml
@@ -1,9 +1,11 @@
-apiVersion: batch/v1
+apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
-  name: cronjob-curl-paddleclas
+  name: cronjob-curl-paddlehelix
 spec:
-  schedule: "*/0 0 * * 5"          # UTC 18:00 CST 24:00
+  schedule: "*/1 12 * * 6"          
+  successfulJobsHistoryLimit: 0
+  failedJobsHistoryLimit: 0  
   jobTemplate:
     spec:
       template:

diff --git a/tekton/cronjobs/curl/paddlenlp.yaml b/tekton/cronjobs/curl/paddlenlp.yaml
@@ -1,9 +1,11 @@
-apiVersion: batch/v1
+apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: cronjob-curl-paddlenlp
 spec:
-  schedule: "*/0 0 * * 1"          # UTC 18:00 CST 24:00
+  schedule: "*/1 0 * * 1"          
+  successfulJobsHistoryLimit: 0
+  failedJobsHistoryLimit: 0
   jobTemplate:
     spec:
       template:

diff --git a/tekton/cronjobs/curl/paddleocr.yaml b/tekton/cronjobs/curl/paddleocr.yaml
@@ -1,9 +1,11 @@
-apiVersion: batch/v1
+apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: cronjob-curl-paddleocr
 spec:
-  schedule: "*/0 0 * * 0"          # UTC 18:00 CST 24:00
+  schedule: "*/1 0 * * 0"          # UTC 18:00 CST 24:00
+  successfulJobsHistoryLimit: 0
+  failedJobsHistoryLimit: 0
   jobTemplate:
     spec:
       template:

diff --git a/tekton/cronjobs/curl/paddlerec.yaml b/tekton/cronjobs/curl/paddlerec.yaml
@@ -1,9 +1,11 @@
-apiVersion: batch/v1
+apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: cronjob-curl-paddlerec
 spec:
-  schedule: "*/0 0 * * 6"          # UTC 18:00 CST 24:00
+  schedule: "*/1 0 * * 6"          # UTC 18:00 CST 24:00
+  successfulJobsHistoryLimit: 0
+  failedJobsHistoryLimit: 0  
   jobTemplate:
     spec:
       template:

diff --git a/tekton/cronjobs/curl/paddlescience.yaml b/tekton/cronjobs/curl/paddlescience.yaml
@@ -1,9 +1,11 @@
-apiVersion: batch/v1
+apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
-  name: cronjob-curl-paddleclas
+  name: cronjob-curl-paddlescience
 spec:
-  schedule: "*/0 0 * * 5"          # UTC 18:00 CST 24:00
+  schedule: "*/1 12 * * 5"          
+  successfulJobsHistoryLimit: 0
+  failedJobsHistoryLimit: 0
   jobTemplate:
     spec:
       template:

diff --git a/tekton/cronjobs/curl/paddleseg.yaml b/tekton/cronjobs/curl/paddleseg.yaml
@@ -1,9 +1,11 @@
-apiVersion: batch/v1
+apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: cronjob-curl-paddleseg
 spec:
-  schedule: "*/0 0 * * 3"          # UTC 18:00 CST 24:00
+  schedule: "*/1 0 * * 3"          # UTC 18:00 CST 24:00
+  successfulJobsHistoryLimit: 0
+  failedJobsHistoryLimit: 0
   jobTemplate:
     spec:
       template:

diff --git a/tekton/cronjobs/curl/paddlespeech.yaml b/tekton/cronjobs/curl/paddlespeech.yaml
@@ -1,9 +1,11 @@
-apiVersion: batch/v1
+apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: cronjob-curl-paddlespeech
 spec:
-  schedule: "*/0 0 * * 4"          # UTC 18:00 CST 24:00
+  schedule: "*/1 0 * * 4"          # UTC 18:00 CST 24:00
+  successfulJobsHistoryLimit: 0
+  failedJobsHistoryLimit: 0
   jobTemplate:
     spec:
       template:

diff --git a/tekton/cronjobs/paddleocr.yaml b/tekton/cronjobs/paddleocr.yaml
@@ -0,0 +1,45 @@
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: cronjob-curl-paddleocr
+spec:
+  schedule: "*/31 16 * * *"          # UTC 18:00 CST 24:00
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          restartPolicy: Never
+          containers:
+          - name: curl-container
+            image: curlimages/curl
+            env:
+            - name: IMAGE_DOCKERHUB_REGISTRY
+              value: paddlecloud
+            - name: IMAGE_BAIDUBCE_REGISTRY
+              value: registry.baidubce.com/paddleflow-public
+            - name: TOOLKIT_NAME
+              value: PaddleSeg
+            - name: TOOLKIT_REVISION
+              value: release/2.5
+            - name: TOOLKIT_BASE_IMAGE_VERSION
+              value: 2.3.0
+            - name: DOCKER_REPO_URL
+              value: https://github.com/freeliuzc/PaddleCloud.git
+            - name: DOCKER_REVISION
+              value: dev-tekton
+            - name: CONTEXT_PATH
+              value: tekton/dockerfiles              
+            - name: DOCKERFILE_PATH
+              value: Dockerfile.seg
+            imagePullPolicy: IfNotPresent
+            args: ["curl", "-X", "POST", "--data",
+                   '{"image-dockerhub-registry": "$(IMAGE_DOCKERHUB_REGISTRY)",
+                   "image-baidubce-registry": "$(IMAGE_BAIDUBCE_REGISTRY)",
+                   "toolkit-repo-name": "$(TOOLKIT_NAME)",
+                   "toolkit-revision": "$(TOOLKIT_REVISION)",
+                   "toolkit-base-image-version": "$(TOOLKIT_BASE_IMAGE_VERSION)",
+                   "docker-repo-url": "$(DOCKER_REPO_URL)",
+                   "docker-revision": "$(DOCKER_REVISION)",
+                   "context-path": "$(CONTEXT_PATH)",
+                   "dockerfile-path": "$(DOCKERFILE_PATH)"}',
+                   "el-cron-listener.default.svc.cluster.local:8080"]
diff --git a/tekton/dockerfiles/Dockerfile b/tekton/dockerfiles/Dockerfile
diff --git a/tekton/dockerfiles/Dockerfile.nlp b/tekton/dockerfiles/Dockerfile.nlp
@@ -43,7 +43,7 @@ WORKDIR /home/${PADDLE_TOOLKIT}
 RUN pip3.7 install --no-cache-dir -r requirements.txt \
     -i https://mirror.baidu.com/pypi/simple
 # LAC may be cause paddle reinstall
-RUN pip3.7 visualdl regex pybind11 zstandard typing-extensions \
+RUN pip3.7 install visualdl regex pybind11 zstandard typing-extensions \
     -i https://mirror.baidu.com/pypi/simple
 RUN python3.7 setup.py install