Merge branch 'mig/13.0/queue_job' into 13.0-test

# Conflicts:
#	.gitmodules
This commit is contained in:
Jared Kipe
2020-10-21 14:31:46 -07:00
6 changed files with 27 additions and 3 deletions

View File

@@ -4,6 +4,7 @@ services:
stages:
- build
- release
- trigger
variables:
@@ -15,7 +16,9 @@ variables:
before_script:
- RELEASE=$(echo $CI_COMMIT_REF_NAME | sed "s{.*\/\(.*\)\/.*{\1{g")
- RELEASE_DATE="$(date '+%Y-%m-%d')"
- IMAGE_TAG=$(echo $CI_COMMIT_REF_SLUG | sed "s/^\([[:digit:]][[:digit:]]\)-\([[:digit:]]\)/\1\.\2/g")
- IMAGE_TAG_DATE="${IMAGE_TAG}-${RELEASE_DATE}"
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
merge_request:
@@ -32,15 +35,28 @@ merge_request:
- docker run $ENVS flow gitlab-automerge --remove-source
build:
variables:
GIT_SUBMODULE_STRATEGY: recursive
stage: build
script:
- apk add git
- git submodule sync --recursive
- git submodule update --init --recursive
- sed -i "s/RELEASE/$RELEASE/g" Dockerfile-GitLab
- docker build --pull -t $CONTAINER_IMAGE:$IMAGE_TAG -f Dockerfile-GitLab .
- docker push $CONTAINER_IMAGE:$IMAGE_TAG
release:
stage: release
variables:
GIT_STRATEGY: none
script:
- apk add python3
- docker pull registry.gitlab.com/hibou-io/hibou-odoo/flow
- docker tag registry.gitlab.com/hibou-io/hibou-odoo/flow flow
- docker run -v "${PWD}/.local:/dest" flow self-install /dest
- cd .local/flow
- ./entrypoint.sh docker-release $CONTAINER_IMAGE:$IMAGE_TAG $CONTAINER_IMAGE:$IMAGE_TAG_DATE
only:
- /^\d+\.\d+$/
publish:
stage: build
script:

4
.gitmodules vendored
View File

@@ -19,3 +19,7 @@
[submodule "external/hibou-shipbox"]
path = external/hibou-shipbox
url = https://gitlab.com/hibou-io/hibou-odoo/shipbox.git
[submodule "external/hibou-oca/queue"]
path = external/hibou-oca/queue
url = https://github.com/hibou-io/oca-queue.git

1
external/hibou-oca/queue vendored Submodule

1
queue_job Symbolic link
View File

@@ -0,0 +1 @@
./external/hibou-oca/queue/queue_job

1
queue_job_cron Symbolic link
View File

@@ -0,0 +1 @@
./external/hibou-oca/queue/queue_job_cron

1
queue_job_subscribe Symbolic link
View File

@@ -0,0 +1 @@
./external/hibou-oca/queue/queue_job_subscribe