Merge branch 'refactor' into 'deploy/like-stage'

linucb cicd 任务移除

See merge request !603

.drone.yml

@@ -82,11 +82,40 @@ steps:
     template: deploy.yaml
     tag: ${DRONE_COMMIT}
 
+- name: deploy-celery-test
+  image: ccr.ccs.tencentyun.com/gm-ai/drone-kube:test
+  when:
+    branch:
+      - deploy/like-test
+    instance:
+      exclude:
+        - cicd.iyanzhi.com
+  environment:
+    repo: alpha/physical
+  settings:
+    namespace: ${DRONE_BRANCH}
+    template: deploy.celery.yaml
+    tag: ${DRONE_COMMIT}
+
+- name: deploy-celery-beat-test
+  image: ccr.ccs.tencentyun.com/gm-ai/drone-kube:test
+  when:
+    branch:
+      - deploy/like-test
+    instance:
+      exclude:
+        - cicd.iyanzhi.com
+  environment:
+    repo: alpha/physical
+  settings:
+    namespace: ${DRONE_BRANCH}
+    template: deploy.celery-beat.yaml
+    tag: ${DRONE_COMMIT}
+
 trigger:
   branch:
   - deploy/*
 
-
 image_pull_secrets:
   - dockerconfig
 

deploy.celery-beat.yaml.temp

+# deployment
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: physical-celery-beat
+    release: physical-celery-beat
+  name: physical-celery-beat
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app: physical-celery-beat
+      release: physical-celery-beat
+  strategy:
+    rollingUpdate:
+      maxSurge: 25%
+      maxUnavailable: 25%
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: physical-celery-beat
+        release: physical-celery-beat
+    spec:
+      containers:
+      - args:
+        -  beat
+        - -A
+        - physical
+        - --loglevel=DEBUG
+        command:
+        - celery
+        image: ccr.ccs.tencentyun.com/gm-ai/like-physical:<IMAGE_TAG>
+        imagePullPolicy: Always
+        name: physical-celery-beat
+      imagePullSecrets:
+      - name: gm-secret
+      restartPolicy: Always
\ No newline at end of file

deploy.celery.yaml.temp

+# deployment
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: physical-celery
+    release: physical-celery
+  name: physical-celery
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app: physical-celery
+      release: physical-celery
+  strategy:
+    rollingUpdate:
+      maxSurge: 25%
+      maxUnavailable: 25%
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: physical-celery
+        release: physical-celery
+    spec:
+      containers:
+      - args:
+        - worker
+        - -A
+        - physical
+        - -Q
+        - tapir-alpha
+        - -c5
+        - --loglevel=INFO
+        - --maxtasksperchild
+        - "500"
+        command:
+        - celery
+        image: ccr.ccs.tencentyun.com/gm-ai/like-physical:<IMAGE_TAG>
+        imagePullPolicy: Always
+        name: physical-celery
+      imagePullSecrets:
+      - name: gm-secret
+      restartPolicy: Always
+---
+# deployment
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: physical-celery-vest
+    release: physical-celery-vest
+  name: physical-celery-vest
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app: physical-celery-vest
+      release: physical-celery-vest
+  strategy:
+    rollingUpdate:
+      maxSurge: 25%
+      maxUnavailable: 25%
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: physical-celery-vest
+        release: physical-celery-vest
+    spec:
+      containers:
+      - args:
+        - worker
+        - -A
+        - physical
+        - -Q
+        - vest
+        - -c5
+        - --loglevel=INFO
+        - --maxtasksperchild
+        - "500"
+        command:
+        - celery
+        image: ccr.ccs.tencentyun.com/gm-ai/like-physical:<IMAGE_TAG>
+        imagePullPolicy: Always
+        name: physical-celery-vest
+      imagePullSecrets:
+      - name: gm-secret
+      restartPolicy: Always

deploy.yaml.temp

@@ -56,4 +56,46 @@ spec:
           protocol: TCP
       imagePullSecrets:
       - name: gm-secret
-      restartPolicy: Always
\ No newline at end of file
+      restartPolicy: Always
+---
+# deployment
+# apiVersion: extensions/v1beta1
+# kind: Deployment
+# metadata:
+#   labels:
+#     app: physical-liucb
+#     release: physical-liucb
+#   name: physical-liucb
+# spec:
+#   replicas: 1
+#   revisionHistoryLimit: 10
+#   selector:
+#     matchLabels:
+#       app: physical-liucb
+#       release: physical-liucb
+#   strategy:
+#     rollingUpdate:
+#       maxSurge: 25%
+#       maxUnavailable: 25%
+#     type: RollingUpdate
+#   template:
+#     metadata:
+#       labels:
+#         app: physical-liucb
+#         release: physical-liucb
+#     spec:
+#       containers:
+#       - command:
+#         - /bin/bash
+#         - -c
+#         - python manage.py trans2es_data2es_parallel -S linucb
+#         image: ccr.ccs.tencentyun.com/gm-ai/like-physical:<IMAGE_TAG>
+#         imagePullPolicy: Always
+#         name: physical-liucb
+#         ports:
+#         - containerPort: 80
+#           name: http
+#           protocol: TCP
+#       imagePullSecrets:
+#       - name: gm-secret
+#       restartPolicy: Always
\ No newline at end of file

deploy/test/settings_local.py

@@ -41,12 +41,12 @@ BROKER_URL = "redis://:Gengmei123@172.21.52.16:6379/8"
 #     },
 # }
 
-LOGIN_URL = "http://earth.gmapp.env/api/account/login_pwd"
-AUTO_CLICK_URL = "http://earth.gmapp.env/api/v1/like"
-AUTO_VOTE_URL = "http://earth.gmapp.env/api/v1/ballot"
-AUTO_REPLY_URL = "http://earth.gmapp.env/api/v1/reply/create"
-AUTO_FOLLOW_URL = "http://earth.gmapp.env/api/v1/follow"
-AUTO_URGE_URL = "http://earth.gmapp.env/api/v1/user/urge"
+LOGIN_URL = "http://earth/api/account/login_pwd"
+AUTO_CLICK_URL = "http://earth/api/v1/like"
+AUTO_VOTE_URL = "http://earth/api/v1/ballot"
+AUTO_REPLY_URL = "http://earth/api/v1/reply/create"
+AUTO_FOLLOW_URL = "http://earth/api/v1/follow"
+AUTO_URGE_URL = "http://earth/api/v1/user/urge"
 SERVICE_NAME = "测试"
 AUTO_INNER_REPLY_URL = "http://saturn.iyanzhi.com/api/v1/reply/create_for_inner"