Topic/default/update odoorpc

.gitlab-ci.yml

@@ -8,6 +8,15 @@
 
 variables:
   HTML_DOC_SOURCES: doc/_build/html
+  TEMP_IMAGE_BASENAME: registry.xcg.io/ci/$CI_PROJECT_PATH_SLUG
+  # do not use $TEMP_IMAGE_BASENAME, it will not be correctly replaced by GitLab
+  TEMP_IMAGE: registry.xcg.io/ci/$CI_PROJECT_PATH_SLUG:hg-$CI_COMMIT_HG_SHA
+
+build-docker-image:
+  needs: []
+  stage: build
+  script:
+  - DOCKER_IMAGE=$TEMP_IMAGE_BASENAME docker-build
 
 import_jsonrpc_odoo11_test:
   stage: test
@@ -70,8 +79,9 @@
     ODOO_TYPE: odoo13
   allow_failure: true
 
-build-docker-image:
-  needs: []
-  variables:
-    TAG_LATEST: branch/default
+docker_build_copy_test:
+  needs:
+  - job: build-docker-image
+  stage: test
+  image: $TEMP_IMAGE
   script:
@@ -77,5 +87,5 @@
   script:
-  - DOCKER_IMAGE=registry.xcg.io/xcgd/odoo_scripts docker-build
-  - DOCKER_BASE_IMAGE_NAME=registry.xcg.io/xcgd/odoo_scripts DOCKER_IMAGE=xcgd/odoo_scripts docker-tag
+  - docker_build_copy
+  - docker_build_clean
 
 build-documentation:
@@ -80,10 +90,12 @@
 
 build-documentation:
-  stage: build
-  needs: []
-  image: python:3.8-alpine
+  # done in test stage to be able to use the built image
+  stage: test
+  needs:
+  - job: build-docker-image
+  image: $TEMP_IMAGE
   artifacts:
     paths:
     - doc/_build
     expire_in: 10m
   script:
@@ -85,11 +97,9 @@
   artifacts:
     paths:
     - doc/_build
     expire_in: 10m
   script:
-  - apk add make mercurial
-  # It might not be necessary to install this and the dependency (maybe just reuse the built image? but its done after)
-  - pip3 install .
+  - apk add make
   - cd doc
   - pip3 install -r requirements hg-evolve
   - for language in en fr ; do LANGUAGE=$language BUILDDIRSUFFIX=/$CI_COMMIT_HG_BRANCH make html ; done
@@ -100,3 +110,19 @@
     artifacts: true
   only:
   - /^branch\/.*/
+
+publish:
+  extends: build-docker-image
+  stage: deploy
+  needs:
+  - job: docker_build_copy_test
+  - job: import_jsonrpc_odoo11_test
+  - job: import_jsonrpc_odoo13_test
+  - job: import_base_import_odoo13_test
+  - job: import_base_import_odoo11_test
+  variables:
+    TAG_LATEST: branch/default
+  script:
+  - DOCKER_BASE_IMAGE_NAME="$TEMP_IMAGE" DOCKER_IMAGE="registry.xcg.io/xcgd/odoo_scripts" tag-img
+  - DOCKER_BASE_IMAGE_NAME="$TEMP_IMAGE" DOCKER_IMAGE="xcgd/odoo_scripts" tag-img
+