overide pipelines

.gitlab-ci.yml

@@ -1,13 +1,43 @@
 stages:
-  - test
+  # - test
-  - build
+  # - build-addon-zip
-  - deploy
+  # - build-amd64
-  - doc
+  - build-arm64
+  # - doc
 
 
 
-include:
+# include:
-  - local: .gitlab/ci/test.gitlab-ci.yml
+#   # - local: .gitlab/ci/test.gitlab-ci.yml
-  - local: .gitlab/ci/build.gitlab-ci.yml
+#   # - local: .gitlab/ci/build-addon.gitlab-ci.yml
-  - local: .gitlab/ci/deploy.gitlab-ci.yml
+#   - local: .gitlab/ci/build-image.gitlab-ci.yml
-  - local: .gitlab/ci/doc.gitlab-ci.yml
+#   # - local: .gitlab/ci/doc.gitlab-ci.yml
+
+build-arm64:
+  stage: build-arm64
+  # needs: ["build-addon-zip"]
+  image: slumber/docker-python  
+  variables:
+    DOCKER_DRIVER: overlay2
+    DOCKER_TLS_CERTDIR: "/certs"
+    GIT_SUBMODULE_STRATEGY: recursive
+  
+  services:
+  - docker:19.03.12-dind
+  before_script:
+    - apk add curl
+    - mkdir -p ~/.docker/cli-plugins
+    - curl -sSLo ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.linux-amd64
+    - chmod +x ~/.docker/cli-plugins/docker-buildx
+    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+    - docker info
+  script:
+    - RP_VERSION="$(python scripts/get_replication_version.py)"
+    - VERSION="$(python scripts/get_addon_version.py)"
+    - echo "Building docker image with replication ${RP_VERSION}"
+    - docker buildx create arm64 --use
+    - docker buildx build --platform linux/arm64 --build-arg version={VERSION} --tag registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION}-arm64 ./scripts/docker_server
+    - echo "Pushing to gitlab registry ${VERSION}-arm64"
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker tag registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION}-arm64 registry.gitlab.com/slumber/multi-user/multi-user-server:${CI_COMMIT_REF_NAME}-arm64
+    - docker push registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION}-arm64

.gitlab/ci/build-addon.gitlab-ci.yml

@@ -1,5 +1,5 @@
-build:
+build-addon-zip:
-  stage: build
+  stage: build-addon-zip
   needs: ["test"]
   image: debian:stable-slim
   script:

.gitlab/ci/build-image.gitlab-ci.yml

@@ -0,0 +1,50 @@
+build-amd64:
+  stage: build-amd64
+  needs: ["build-addon-zip"]
+  image: slumber/docker-python  
+  variables:
+    DOCKER_DRIVER: overlay2
+    DOCKER_TLS_CERTDIR: "/certs"
+    GIT_SUBMODULE_STRATEGY: recursive
+  
+  services:
+  - docker:19.03.12-dind
+
+  script:
+    - RP_VERSION="$(python scripts/get_replication_version.py)"
+    - VERSION="$(python scripts/get_addon_version.py)"
+    - echo "Building docker image with replication ${RP_VERSION}"
+    - docker build --build-arg replication_version=${RP_VERSION}  --build-arg version={VERSION} -t registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION} ./scripts/docker_server
+    - echo "Pushing to gitlab registry ${VERSION}"
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker tag registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION} registry.gitlab.com/slumber/multi-user/multi-user-server:${CI_COMMIT_REF_NAME}
+    - docker push registry.gitlab.com/slumber/multi-user/multi-user-server
+
+build-arm64:
+  stage: build-arm64
+  # needs: ["build-addon-zip"]
+  image: slumber/docker-python  
+  variables:
+    DOCKER_DRIVER: overlay2
+    DOCKER_TLS_CERTDIR: "/certs"
+    GIT_SUBMODULE_STRATEGY: recursive
+  
+  services:
+  - docker:19.03.12-dind
+  before_script:
+    - apk add curl
+    - mkdir -p ~/.docker/cli-plugins
+    - curl -sSLo ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.linux-amd64
+    - chmod +x ~/.docker/cli-plugins/docker-buildx
+    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+    - docker info
+  script:
+    - RP_VERSION="$(python scripts/get_replication_version.py)"
+    - VERSION="$(python scripts/get_addon_version.py)"
+    - echo "Building docker image with replication ${RP_VERSION}"
+    - docker buildx create arm64 --use
+    - docker buildx build --platform linux/arm64 --build-arg version={VERSION} --tag registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION}-arm64 ./scripts/docker_server
+    - echo "Pushing to gitlab registry ${VERSION}-arm64"
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker tag registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION}-arm64 registry.gitlab.com/slumber/multi-user/multi-user-server:${CI_COMMIT_REF_NAME}-arm64
+    - docker push registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION}-arm64

.gitlab/ci/deploy.gitlab-ci.yml

@@ -1,21 +0,0 @@
-deploy:
-  stage: deploy
-  needs: ["build"]
-  image: slumber/docker-python  
-  variables:
-    DOCKER_DRIVER: overlay2
-    DOCKER_TLS_CERTDIR: "/certs"
-    GIT_SUBMODULE_STRATEGY: recursive
-  
-  services:
-  - docker:19.03.12-dind
-
-  script:
-    - RP_VERSION="$(python scripts/get_replication_version.py)"
-    - VERSION="$(python scripts/get_addon_version.py)"
-    - echo "Building docker image with replication ${RP_VERSION}"
-    - docker build --build-arg replication_version=${RP_VERSION}  --build-arg version={VERSION} -t registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION} ./scripts/docker_server
-    - echo "Pushing to gitlab registry ${VERSION}"
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker tag registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION} registry.gitlab.com/slumber/multi-user/multi-user-server:${CI_COMMIT_REF_NAME}
-    - docker push registry.gitlab.com/slumber/multi-user/multi-user-server

.gitlab/ci/doc.gitlab-ci.yml

@@ -1,6 +1,6 @@
 pages:
   stage: doc
-  needs: ["deploy"]
+  needs: ["build-arm64","build-amd64"]
   image: python
   script:
   - pip install -U sphinx sphinx_rtd_theme sphinx-material