diff --git a/build/ci/.build-container.yml b/build/ci/.build-container.yml index 68bc705e047382c2a9a5d844d7e03ed001e40862..84f616335b3ba288722ae8608e659f72fc120529 100644 --- a/build/ci/.build-container.yml +++ b/build/ci/.build-container.yml @@ -39,5 +39,5 @@ build-docker: - docker push $DOCKER_IMAGE_SHA - docker tag $DOCKER_IMAGE_SHA $TAG - docker push $TAG - - docker build --target installer --build-arg GITLAB_USER=$GO_MODULES_USER --build-arg GITLAB_TOKEN=$GO_MODULES_ACCESS_TOKEN --build-arg BUILDARGS=$BUILDARGS -t registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID} . - - docker push registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID} \ No newline at end of file + - docker build --target installer --build-arg GITLAB_USER=$GO_MODULES_USER --build-arg GITLAB_TOKEN=$GO_MODULES_ACCESS_TOKEN --build-arg BUILDARGS=$BUILDARGS -t ${CI_REGISTRY_IMAGE}:testing_${CI_PIPELINE_ID} . + - docker push ${CI_REGISTRY_IMAGE}:testing_${CI_PIPELINE_ID} \ No newline at end of file diff --git a/build/ci/.test.yml b/build/ci/.test.yml index 106d29b7893283c1d9751fd7c1aad12c7bf999c0..833275837269aab817a26d6ac8bd97e60296efec 100644 --- a/build/ci/.test.yml +++ b/build/ci/.test.yml @@ -1,5 +1,5 @@ .integration-test: &integration-test - image: registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID} + image: ${CI_REGISTRY_IMAGE}:testing_${CI_PIPELINE_ID} stage: integration-test needs: - job: "containerlab:deploy" @@ -34,7 +34,7 @@ integration-test:api: - go test -race -v -run TestApiIntegration .test: &test - image: registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID} + image: ${CI_REGISTRY_IMAGE}:testing_${CI_PIPELINE_ID} stage: test allow_failure: true variables: