Skip to content

Commit 6e154b1

Browse files
author
Juan Pablo Dorsch
committed
Merge branch 'RESTAPI-fix-copy-f7t-base-img' into 'master'
Restapi fix copy f7t base img See merge request firecrest/firecrest!340
2 parents ea06278 + 79f48af commit 6e154b1

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,8 @@ tag_release:
267267
GH_PAT="$(vault kv get -field=ghcr_pat_token firecrest/prod/)"
268268
crane auth login ghcr.io --username $GH_USER --password $GH_PAT
269269
# publish 'f7t-base'
270-
crane copy ${CI_REGISTRY_PREFIX}/f7t-base:$CI_COMMIT_TAG ghcr.io/eth-cscs/firecrest/f7t-base:${tag}
270+
jfrog rt copy --flat=true --url="https://${CI_REGISTRY}/artifactory" --user="${CI_REGISTRY_USER}" --password="${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY_GROUP}/f7t-base/tmp-${CI_COMMIT_SHORT_SHA}-${CI_PIPELINE_ID}/" "${CI_REGISTRY_GROUP}/f7t-base/$tag/";
271+
crane copy ${CI_REGISTRY_PREFIX}/f7t-base:${tag} ghcr.io/eth-cscs/firecrest/f7t-base:${tag}
271272
crane tag ghcr.io/eth-cscs/firecrest/f7t-base:${tag} latest
272273
fi
273274
images="certificator compute reservations status storage tasks utilities";

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [1.16.3]
9+
10+
11+
### Added
12+
13+
### Changed
14+
15+
### Fixed
16+
17+
- Fix CI pipeline when tagging `f7t-base` in local repository
18+
819
## [1.16.2]
920

1021

0 commit comments

Comments
 (0)