diff options
| author | Wen Liang <liangwen12year@gmail.com> | 2023-06-28 12:20:38 -0400 |
|---|---|---|
| committer | Wen Liang <liangwen12year@gmail.com> | 2023-06-28 12:51:18 -0400 |
| commit | 987f8b2fb2ff10b142e7d61ffcfd681c82ff1204 (patch) | |
| tree | 7bb4378c7d0b4f45b297bd6a20cd1e4d01648fc4 | |
| parent | 6a3db3e121debc53a43f99186d86a593a433a551 (diff) | |
gitlab-ci: add alpine:edge containerwl/pipeline
| -rw-r--r-- | .gitlab-ci.yml | 33 | ||||
| -rw-r--r-- | .gitlab-ci/config.yml | 1 |
2 files changed, 29 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 665c428e4b..3c7df4fe2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,11 +57,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bumping # ".default_tag". - ALPINE_TAG: 'tag-d53edbf2ebdd' - CENTOS_TAG: 'tag-c374af7add25' - DEBIAN_TAG: 'tag-33f59276e980' - FEDORA_TAG: 'tag-c374af7add25' - UBUNTU_TAG: 'tag-33f59276e980' + ALPINE_TAG: 'tag-c8098af7124c' + CENTOS_TAG: 'tag-3d4e015f0349' + DEBIAN_TAG: 'tag-b53d33c8107d' + FEDORA_TAG: 'tag-3d4e015f0349' + UBUNTU_TAG: 'tag-b53d33c8107d' ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh' CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh' @@ -437,6 +437,17 @@ tier2:alpine:latest@prep: FDO_DISTRIBUTION_EXEC: $ALPINE_EXEC when: manual +tier2:alpine:edge@prep: + extends: + - .fdo.container-build@alpine + stage: prep + variables: + GIT_STRATEGY: none + FDO_DISTRIBUTION_VERSION: 'edge' + FDO_DISTRIBUTION_TAG: $ALPINE_TAG + FDO_DISTRIBUTION_EXEC: $ALPINE_EXEC + when: manual + ################################################################# # # # tierN stage # @@ -836,6 +847,18 @@ t_alpine:latest: needs: - "tier2:alpine:latest@prep" +t_alpine:edge: + extends: + - .build@template + - .fdo.distribution-image@alpine + - .nm_artifacts_debug + stage: tier2 + variables: + FDO_DISTRIBUTION_VERSION: 'edge' + FDO_DISTRIBUTION_TAG: $ALPINE_TAG + needs: + - "tier2:alpine:edge@prep" + ################################################################# # # # specific jobs # diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 1bbd698b94..4ec883b455 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -77,3 +77,4 @@ distributions: tier: 2 versions: - 'latest' + - 'edge' |