Commit 11f01f8f authored by Pantelis Malekas's avatar Pantelis Malekas
Browse files

fix: minor alignment fixes

parent c28e7d8e

.gitlab-ci.yml

+14 −11
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ dev_image_build_job: 
  variables:

    BUILT_IMAGE: "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA"

  before_script:

    - docker info

    - echo -n "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"

    - docker info > /dev/null

    - echo -n $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY

    - apk add --no-cache curl

  script:

    - >
@@ -74,9 +74,9 @@ dev_image_build_job: 
      --build-arg USERNAME="$CI_REGISTRY_USER"

      --build-arg PASSWORD="$CI_JOB_TOKEN"

      --build-arg CI_SERVER_HOST="$CI_SERVER_HOST"

      -t "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA"

      -f "$DOCKERFILE" .

    - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA"

      -t $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA

      -f $DOCKERFILE .

    - docker push $CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA



    # Store the exact built image for the next develop pipeline

    - |
@@ -84,10 +84,8 @@ dev_image_build_job: 
        --header "PRIVATE-TOKEN: $GROUP_ACCESS_TOKEN" \

        --form "value=$BUILT_IMAGE" \

        "$CI_API_V4_URL/projects/$CI_PROJECT_ID/variables/LAST_MR_BUILT_IMAGE"



  after_script:

    - docker image rm -f "$BUILT_IMAGE" || true



  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"'
@@ -130,12 +128,16 @@ validate_main_source_job: 




semantic_versioning_job:

  image: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/node:lts

  image:

    name: labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/node:lts

  stage: release

  tags:

    - hypo

  variables:

    GITLAB_TOKEN: $GROUP_ACCESS_TOKEN

  before_script:

    - git fetch origin main

    - git reset --hard origin/main

  script:

    - RELEASE_VERSION=$(npx -y

      -p @semantic-release/commit-analyzer@9.0.2
@@ -146,7 +148,8 @@ semantic_versioning_job: 
      -p @semantic-release/changelog@6.0.2

      -p conventional-changelog-conventionalcommits@5.0.0

      -p semantic-release@19.0.5

      semantic-release | grep -oP '(?<=Published release ).*' | awk '{print $1}' || echo "no-release" )

      semantic-release

    - RELEASE_VERSION=$(cat .next-release-version 2>/dev/null || echo "no-release")

    - echo "$RELEASE_VERSION" > release_version.txt

    - cat release_version.txt

  artifacts:
@@ -166,9 +169,9 @@ image_build_job: 
  before_script:

    - docker info > /dev/null

    - RELEASE_VERSION=$(cat release_version.txt)

    - echo "$RELEASE_VERSION"

    - echo $RELEASE_VERSION

    - if [ "$RELEASE_VERSION" = "no-release" ]; then exit 0; fi

    - echo -n "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"

    - echo -n $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY

  script:

    - docker pull $CI_REGISTRY_IMAGE/$IMAGE_NAME:dev-latest

    - docker tag $CI_REGISTRY_IMAGE/$IMAGE_NAME:dev-latest $CI_REGISTRY_IMAGE/$IMAGE_NAME:latest