Skip to content
Snippets Groups Projects
Commit 2770375e authored by Andrew Kapuscinski's avatar Andrew Kapuscinski
Browse files

Merge branch 'SSA-6730' into 'development' 

testing push images on merge again

See merge request ssa/data!4
parents efe3ee8f ce2e1572
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 4 deletions
.gitlab-ci.yml
+ 16
− 4
View file @ 2770375e
...@@ -35,6 +35,10 @@ build dev workflow: ...@@ -35,6 +35,10 @@ build dev workflow:
rules: rules:
- if: $CI_COMMIT_MESSAGE =~ /\A(?i)Revert/ - if: $CI_COMMIT_MESSAGE =~ /\A(?i)Revert/
when: always when: always
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
changes:
- .gitlab-ci.yml
when: always
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
changes: changes:
- services/workflow/**/* - services/workflow/**/*
...@@ -49,6 +53,10 @@ build dev capability: ...@@ -49,6 +53,10 @@ build dev capability:
rules: rules:
- if: $CI_COMMIT_MESSAGE =~ /\A(?i)Revert/ - if: $CI_COMMIT_MESSAGE =~ /\A(?i)Revert/
when: always when: always
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
changes:
- .gitlab-ci.yml
when: always
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
changes: changes:
- services/capability/**/* - services/capability/**/*
...@@ -64,8 +72,10 @@ push dev workflow: ...@@ -64,8 +72,10 @@ push dev workflow:
- docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_SHORT_SHA - docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_SHORT_SHA
- docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
- docker push marconi.aoc.nrao.edu/workspaces/workflow:dev - docker push marconi.aoc.nrao.edu/workspaces/workflow:dev
rules: only:
- if: ('$CI_PIPELINE_SOURCE == "merge_request_event"' && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/) - development
# rules:
# - if: ('$CI_PIPELINE_SOURCE == "merge_request_event"' && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/)
# needs: ["build dev workflow"] # needs: ["build dev workflow"]
push dev capability: push dev capability:
...@@ -75,8 +85,10 @@ push dev capability: ...@@ -75,8 +85,10 @@ push dev capability:
- docker tag marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME marconi.aoc.nrao.edu/workspaces/capability:dev - docker tag marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME marconi.aoc.nrao.edu/workspaces/capability:dev
- docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_SHORT_SHA - docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_SHORT_SHA
- docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
rules: only:
- if: ('$CI_PIPELINE_SOURCE == "merge_request_event"' && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/) - development
# rules:
# - if: ('$CI_PIPELINE_SOURCE == "merge_request_event"' && $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/)
# needs: ["build dev capability"] # needs: ["build dev capability"]
# Cleanup # Cleanup
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment