Fix pipeline and container build

Author: david-woelfle

.gitlab-ci.yml

@@ -33,9 +33,15 @@ variables:
 build_and_test_energy_service_generics:
   <<: *docker_jobs_common
   stage: build_and_test
+  rules:
+    - if: '$CI_COMMIT_TAG'
   script:
-    - bash bash build-docker-images.sh $IMAGE_TAG_BASE
+    - sh build-docker-images.sh $IMAGE_TAG_BASE
     # Once all versions of the image are known to be working, push those.
+    - docker image tag energy-service-generics:${IMAGE_TAG_BASE} $IMAGE_NAME:${IMAGE_TAG_BASE}
+    - docker image tag energy-service-generics:${IMAGE_TAG_BASE}-service $IMAGE_NAME:${IMAGE_TAG_BASE}-service
+    - docker image tag energy-service-generics:${IMAGE_TAG_BASE}-pandas $IMAGE_NAME:${IMAGE_TAG_BASE}-pandas
+    - docker image tag energy-service-generics:${IMAGE_TAG_BASE}-service-pandas $IMAGE_NAME:${IMAGE_TAG_BASE}-service-pandas
     - docker push $IMAGE_NAME:${IMAGE_TAG_BASE}
     - docker push $IMAGE_NAME:${IMAGE_TAG_BASE}-service
     - docker push $IMAGE_NAME:${IMAGE_TAG_BASE}-pandas

build-docker-images.sh

@@ -21,13 +21,13 @@ IMAGE_TAG_BASE=${1:-latest}
 # NOTE: The builds are in such an order that as much as possible of layers
 #       can be reused to keep build times low.
 docker build --target esg-base -t $IMAGE_NAME:${IMAGE_TAG_BASE} $SOURCE_PATH
-docker run --rm -t $IMAGE_NAME:$IMAGE_TAG_BASE pytest
+docker run --rm -t $IMAGE_NAME:$IMAGE_TAG_BASE pytest /source/energy_service_generics/tests/
 docker build --target esg-service -t $IMAGE_NAME:${IMAGE_TAG_BASE}-service $SOURCE_PATH
-docker run --rm -t $IMAGE_NAME:${IMAGE_TAG_BASE}-service pytest
+docker run --rm -t $IMAGE_NAME:${IMAGE_TAG_BASE}-service pytest /source/energy_service_generics/tests/
 docker build --target esg-pandas -t $IMAGE_NAME:${IMAGE_TAG_BASE}-pandas $SOURCE_PATH
-docker run --rm -t $IMAGE_NAME:${IMAGE_TAG_BASE}-pandas pytest
+docker run --rm -t $IMAGE_NAME:${IMAGE_TAG_BASE}-pandas pytest /source/energy_service_generics/tests/
 docker build --target esg-service-pandas -t $IMAGE_NAME:${IMAGE_TAG_BASE}-service-pandas $SOURCE_PATH
-docker run --rm -t $IMAGE_NAME:${IMAGE_TAG_BASE}-service-pandas pytest
+docker run --rm -t $IMAGE_NAME:${IMAGE_TAG_BASE}-service-pandas pytest /source/energy_service_generics/tests/
 
 printf "\033[0;32m\n" # Make text green
 printf "Success! "

source/Dockerfile

@@ -16,7 +16,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Base image for tag x.y.z
-FROM python:3.11 as esg-base
+FROM python:3.11 AS esg-base
 
 # Install the auto-pytest tool incl. dependencies.
 RUN apt-get update && \
@@ -46,15 +46,15 @@ COPY esg/service/dummy_fooc.py /source/service/fooc.py
 
 # Extended image for tag x.y.z-service
 # Contains the additional dependencies to run a service.
-FROM esg-base as esg-service
+FROM esg-base AS esg-service
 
 RUN pip install /source/energy_service_generics[service]
 
 
 
 # Extended image for tag x.y.z-pandas
 # Contains pandas -> allows the usage of esg.utils.pandas
-FROM esg-base as esg-pandas
+FROM esg-base AS esg-pandas
 
 RUN pip install /source/energy_service_generics[pandas]
 
@@ -63,6 +63,6 @@ RUN pip install /source/energy_service_generics[pandas]
 # Contains pandas, allows the usage of esg.utils.pandas
 # This starts from the pandas stage as installing pandas will likely
 # take longer then the dependencies of the service.
-FROM esg-pandas as esg-service-pandas
+FROM esg-pandas AS esg-service-pandas
 
 RUN pip install /source/energy_service_generics[service,pandas]

source/tests/service/test_api.py

@@ -610,6 +610,10 @@ def __exit__(self, *_):
         self.process.join()
 
 
+@pytest.mark.skipif(
+    service_extra_not_installed,
+    reason="requires installation with `service` extra.",
+)
 class TestApiValidateJwt:
     """
     Tests for `esg.service.api.API.validate_jwt`.
@@ -1119,14 +1123,14 @@ class TestPostRequest(PostEndpointTests):
                 "loc": ["arguments", "argument_as_float"],
                 "msg": "Field required",
                 "input": {"noFieldInModel": "foo bar"},
-                "url": "https://errors.pydantic.dev/2.7/v/missing",
+                "url": "https://errors.pydantic.dev/2.8/v/missing",
             },
             {
                 "type": "missing",
                 "loc": ["parameters"],
                 "msg": "Field required",
                 "input": {"arguments": {"noFieldInModel": "foo bar"}},
-                "url": "https://errors.pydantic.dev/2.7/v/missing",
+                "url": "https://errors.pydantic.dev/2.8/v/missing",
             },
         ]
     }
@@ -1159,14 +1163,14 @@ class TestPostFitParameters(PostEndpointTests):
                 "loc": ["arguments", "argument_as_float"],
                 "msg": "Field required",
                 "input": {"noFieldInModel": "foo bar"},
-                "url": "https://errors.pydantic.dev/2.7/v/missing",
+                "url": "https://errors.pydantic.dev/2.8/v/missing",
             },
             {
                 "type": "missing",
                 "loc": ["observations"],
                 "msg": "Field required",
                 "input": {"arguments": {"noFieldInModel": "foo bar"}},
-                "url": "https://errors.pydantic.dev/2.7/v/missing",
+                "url": "https://errors.pydantic.dev/2.8/v/missing",
             },
         ]
     }