From b670d1aa6b6e2af0cb09e7dbc77ea5d1bc66593b Mon Sep 17 00:00:00 2001
From: Ivan Usov <ivan.usov@psi.ch>
Date: Wed, 17 Apr 2024 14:14:32 +0200
Subject: [PATCH] ci: cleanup ARGs in dockerfiles

---
 .gitlab-ci.yml           | 14 +++++++-------
 ci/Dockerfile.run_pytest |  9 +++++----
 ci/Dockerfile.run_server | 11 +++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e68111c..b94aa8af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -190,7 +190,7 @@ end-2-end:
     # build and run the tests
     - echo $OPHYD_DEVICES_BRANCH 
     - echo "$CI_DEPENDENCY_PROXY_PASSWORD" | docker login $CI_DEPENDENCY_PROXY_SERVER --username $CI_DEPENDENCY_PROXY_USER --password-stdin
-    - docker build -t end2end_client:test -f ./ci/Dockerfile.run_pytest --build-arg PY_VERSION=3.10 --build-arg BEC_SERVICE=bec_ipython_client --build-arg OPHYD_BRANCH=$OPHYD_DEVICES_BRANCH --build-arg CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX .
+    - docker build -t end2end_client:test -f ./ci/Dockerfile.run_pytest --build-arg PY_VERSION=3.10 --build-arg BEC_SERVICE=bec_ipython_client --build-arg OPHYD_DEVICES_BRANCH --build-arg CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX .
     - docker run --network=host --name end2end_client end2end_client:test
 
   after_script:
@@ -251,12 +251,12 @@ end-2-end:
 #     # build containers
 #     # /!\ build-arg is interpreted differently by podman,
 #     # have to use buildah here
-#     - buildah bud --network=host -t device_server_vm -f ./ci/Dockerfile.run_server --build-arg PY_VERSION=3.10 --build-arg BEC_SERVICE=device_server --build-arg OPHYD_BRANCH=$OPHYD_DEVICES_BRANCH --build-arg CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
-#     - buildah bud --network=host -t scan_server_vm -f ./ci/Dockerfile.run_server --build-arg PY_VERSION=3.10 --build-arg BEC_SERVICE=scan_server --build-arg OPHYD_BRANCH=$OPHYD_DEVICES_BRANCH --build-arg CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
-#     - buildah bud --network=host -t scan_bundler_vm -f ./ci/Dockerfile.run_server --build-arg PY_VERSION=3.10 --build-arg BEC_SERVICE=scan_bundler --build-arg OPHYD_BRANCH=$OPHYD_DEVICES_BRANCH --build-arg CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
-#     - buildah bud --network=host -t file_writer_vm -f ./ci/Dockerfile.run_server --build-arg PY_VERSION=3.10 --build-arg BEC_SERVICE=file_writer --build-arg OPHYD_BRANCH=$OPHYD_DEVICES_BRANCH --build-arg CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
-#     - buildah bud --network=host -t dap_server_vm -f ./ci/Dockerfile.run_server --build-arg PY_VERSION=3.10 --build-arg BEC_SERVICE=data_processing --build-arg OPHYD_BRANCH=$OPHYD_DEVICES_BRANCH --build-arg CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
-#     - buildah bud --network=host -t scihub_vm -f ./ci/Dockerfile.run_server --build-arg PY_VERSION=3.10 --build-arg BEC_SERVICE=scihub --build-arg OPHYD_BRANCH=$OPHYD_DEVICES_BRANCH --build-arg CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
+#     - buildah bud --network=host -t device_server_vm -f ./ci/Dockerfile.run_server --build-arg PY_VERSION=3.10 --build-arg BEC_SERVICE=device_server --build-arg OPHYD_DEVICES_BRANCH --build-arg CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
+#     - buildah bud --network=host -t scan_server_vm -f ./ci/Dockerfile.run_server --build-arg PY_VERSION=3.10 --build-arg BEC_SERVICE=scan_server --build-arg OPHYD_DEVICES_BRANCH --build-arg CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
+#     - buildah bud --network=host -t scan_bundler_vm -f ./ci/Dockerfile.run_server --build-arg PY_VERSION=3.10 --build-arg BEC_SERVICE=scan_bundler --build-arg OPHYD_DEVICES_BRANCH --build-arg CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
+#     - buildah bud --network=host -t file_writer_vm -f ./ci/Dockerfile.run_server --build-arg PY_VERSION=3.10 --build-arg BEC_SERVICE=file_writer --build-arg OPHYD_DEVICES_BRANCH --build-arg CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
+#     - buildah bud --network=host -t dap_server_vm -f ./ci/Dockerfile.run_server --build-arg PY_VERSION=3.10 --build-arg BEC_SERVICE=data_processing --build-arg OPHYD_DEVICES_BRANCH --build-arg CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
+#     - buildah bud --network=host -t scihub_vm -f ./ci/Dockerfile.run_server --build-arg PY_VERSION=3.10 --build-arg BEC_SERVICE=scihub --build-arg OPHYD_DEVICES_BRANCH --build-arg CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
 #     # default service is bec_ipython_client
 #     - buildah bud --network=host -t end2end_client_test -f ./ci/Dockerfile.run_server --build-arg PY_VERSION=3.10 --build-arg CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
 
diff --git a/ci/Dockerfile.run_pytest b/ci/Dockerfile.run_pytest
index ce4e78ec..b5ca46f4 100644
--- a/ci/Dockerfile.run_pytest
+++ b/ci/Dockerfile.run_pytest
@@ -1,10 +1,11 @@
 # set base image (host OS)
-ARG PY_VERSION=3.10 BEC_SERVICE=bec_ipython_client OPHYD_BRANCH=master CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
+ARG PY_VERSION=3.10 CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
+
 FROM $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:${PY_VERSION}
 
-ARG BEC_SERVICE=bec_ipython_client OPHYD_BRANCH=master
+ARG BEC_SERVICE=bec_ipython_client OPHYD_DEVICES_BRANCH=main
 
-RUN echo "Building ${BEC_SERVICE} with Ophyd branch ${OPHYD_BRANCH} "
+RUN echo "Building ${BEC_SERVICE} with Ophyd branch ${OPHYD_DEVICES_BRANCH} "
 
 RUN apt update
 RUN apt install redis -y
@@ -20,7 +21,7 @@ RUN mkdir /code/bec/test_files
 ENV OPHYD_DEVICES_PATH=/code/bec/ophyd_devices
 
 WORKDIR /code/bec
-RUN git clone --branch ${OPHYD_BRANCH} https://gitlab.psi.ch/bec/ophyd_devices
+RUN git clone --branch ${OPHYD_DEVICES_BRANCH} https://gitlab.psi.ch/bec/ophyd_devices
 WORKDIR /code/bec/ophyd_devices
 RUN pip install -e .
 WORKDIR /code/bec/
diff --git a/ci/Dockerfile.run_server b/ci/Dockerfile.run_server
index 1345b96a..664eda2e 100644
--- a/ci/Dockerfile.run_server
+++ b/ci/Dockerfile.run_server
@@ -1,12 +1,11 @@
 # set base image (host OS)
-ARG PY_VERSION=3.10 OPHYD_BRANCH=master BEC_SERVICE=bec_ipython_client
-
-ARG BEC_SERVICE=bec_ipython_client OPHYD_BRANCH=master
-ARG CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
+ARG PY_VERSION=3.10 CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
 
 FROM $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:${PY_VERSION}
 
-RUN echo "Building ${BEC_SERVICE} with Ophyd branch ${OPHYD_BRANCH}"
+ARG BEC_SERVICE=bec_ipython_client OPHYD_DEVICES_BRANCH=main 
+
+RUN echo "Building ${BEC_SERVICE} with Ophyd branch ${OPHYD_DEVICES_BRANCH}"
 
 RUN apt update
 RUN apt install git -y
@@ -20,7 +19,7 @@ COPY . ./bec
 ENV OPHYD_DEVICES_PATH=/code/bec/ophyd_devices
 
 WORKDIR /code/bec
-RUN git clone --branch ${OPHYD_BRANCH} https://gitlab.psi.ch/bec/ophyd_devices
+RUN git clone --branch ${OPHYD_DEVICES_BRANCH} https://gitlab.psi.ch/bec/ophyd_devices
 WORKDIR /code/bec/ophyd_devices
 RUN pip install -e .
 WORKDIR /code/bec/pytest_bec_e2e