WIP: Develop

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.

.gitlab/ci/.build-container.yml

@@ -4,21 +4,9 @@
       - shell-builder
     variables:
         TAG: $CI_COMMIT_SHA
-    before_script:
-        # replace all slashes in the tag with hyphen, because slashes are not allowed in tags
-        - TAG=${TAG//\//-}
     needs: []
 
 build-testing-image:
-    rules:
-        - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-          variables:
-              TAG: latest
-        - if: $CI_COMMIT_BRANCH == "develop"
-          variables:
-              TAG: $CI_COMMIT_BRANCH
-              BUILDARGS: -race
-        - when: always
     script:
         - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
         - docker build -t "$GOSDN_TESTING_IMAGE" -f "${CI_PROJECT_DIR}/controller/Dockerfile" --target "installer" --build-arg "GOLANG_VERSION=$GOLANG_VERSION" --build-arg "BUILDARGS=$BUILDARGS" --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/" .
@@ -26,19 +14,12 @@ build-testing-image:
     <<: *build
 
 build-image:
-    rules:
-        - if: '$CI_PIPELINE_SOURCE != "merge_request_event"'
-          when: never
-        - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-          variables:
-              TAG: $CI_DEFAULT_BRANCH
-        - if: $CI_COMMIT_BRANCH == "develop"
-          variables:
-              TAG: develop
-              BUILDARGS: -race
-        - when: always
     script:
         - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-        - docker build -t "$CI_REGISTRY_IMAGE:$TAG" -f "${CI_PROJECT_DIR}/controller/Dockerfile" --target "installer" --build-arg "GOLANG_VERSION=$GOLANG_VERSION" --build-arg "BUILDARGS=$BUILDARGS" --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/" .
+        - docker build -t "$CI_REGISTRY_IMAGE:$TAG" -f "${CI_PROJECT_DIR}/controller/Dockerfile" --build-arg "GOLANG_VERSION=$GOLANG_VERSION" --build-arg "BUILDARGS=$BUILDARGS" --build-arg "GITLAB_PROXY=${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/" .
         - docker push "$CI_REGISTRY_IMAGE:$TAG"
+        # replace all slashes in the tag with hyphen, because slashes are not allowed in tags
+        - NEWTAG=${CI_COMMIT_BRANCH//\//-}
+        - docker tag "$CI_REGISTRY_IMAGE:$TAG" "$CI_REGISTRY_IMAGE:$NEWTAG"
+        - docker push "$CI_REGISTRY_IMAGE:$NEWTAG"
     <<: *build