Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update gitlab support dependencies #248

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-docs-shim.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
matrix:
type: [install, upgrade]
flavor: [upstream, registry1, unicorn]
uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.0
uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@7381e2081c60c745855a95646372165eae4de41a # v1.6.0
with:
flavor: ${{ matrix.flavor }}
type: ${{ matrix.type }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/commitlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ permissions:

jobs:
validate:
uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.0
uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@7381e2081c60c745855a95646372165eae4de41a # v1.6.0
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: Lint
on:
# This workflow is triggered on pull requests to the main branch.
pull_request:
# milestoned is added here as a workaround for release-please not triggering PR workflows (PRs should be added to a milestone to trigger the workflow).
# milestoned is added here as a way to retrigger workflows that are stuck or otherwise didn't run correctly
types: [milestoned, opened, reopened, synchronize]

# Permissions for the GITHUB_TOKEN used by the workflow.
Expand All @@ -15,5 +15,5 @@ permissions:

jobs:
validate:
uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.0
uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@7381e2081c60c745855a95646372165eae4de41a # v1.6.0
secrets: inherit
21 changes: 4 additions & 17 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,11 @@ permissions:
id-token: write

jobs:
tag-new-version:
permissions: write-all
runs-on: ubuntu-latest
outputs:
release_created: ${{ steps.release-flag.outputs.release_created }}
steps:
- name: Create Release Tag
id: tag
uses: googleapis/release-please-action@7987652d64b4581673a76e33ad5e98e3dd56832f # v4.1.3
- id: release-flag
run: echo "release_created=${{ steps.tag.outputs.release_created || false }}" >> "$GITHUB_OUTPUT"

publish:
permissions:
contents: read # Allows reading the content of the repository.
packages: write # Allows reading the content of the repository's packages.
contents: write # Allows writing the content of the repository.
packages: write # Allows writing the content of the repository's packages.
id-token: write
needs: tag-new-version
if: ${{ needs.tag-new-version.outputs.release_created == 'true' }}
strategy:
matrix:
flavor: [upstream, registry1, unicorn]
Expand All @@ -43,9 +29,10 @@ jobs:
architecture: arm64
- flavor: unicorn
architecture: arm64
uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.0
uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@7381e2081c60c745855a95646372165eae4de41a # v1.6.0
with:
flavor: ${{ matrix.flavor }}
runsOn: ${{ matrix.architecture == 'arm64' && 'uds-swf-ubuntu-arm64-4-core' || 'uds-swf-ubuntu-big-boy-8-core' }}
timeout: 60
uds-releaser: true
secrets: inherit # Inherits all secrets from the parent workflow.
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ jobs:
security-events: write
# Used to receive a badge.
id-token: write
uses: defenseunicorns/uds-common/.github/workflows/callable-scorecard.yaml@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.0
uses: defenseunicorns/uds-common/.github/workflows/callable-scorecard.yaml@7381e2081c60c745855a95646372165eae4de41a # v1.6.0
secrets: inherit
9 changes: 4 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: Test
on:
# This workflow is triggered on pull requests to the main branch.
pull_request:
# milestoned is added here as a workaround for release-please not triggering PR workflows (PRs should be added to a milestone to trigger the workflow).
# milestoned is added here as a way to retrigger workflows that are stuck or otherwise didn't run correctly
types: [milestoned, opened, reopened, synchronize]
paths-ignore:
- "**.md"
Expand All @@ -18,8 +18,7 @@ on:
- docs/**
- .gitignore
- renovate.json
- .release-please-config.json
- release-please-config.json
- releaser.yaml
- CODEOWNERS
- LICENSE
- CONTRIBUTING.md
Expand All @@ -44,7 +43,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: test-flavor
uses: defenseunicorns/uds-common/.github/actions/test-flavor@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.0
uses: defenseunicorns/uds-common/.github/actions/test-flavor@7381e2081c60c745855a95646372165eae4de41a # v1.6.0
id: test-flavor
outputs:
upgrade-flavors: ${{ steps.test-flavor.outputs.upgrade-flavors }}
Expand All @@ -56,7 +55,7 @@ jobs:
matrix:
type: [install, upgrade]
flavor: [upstream, registry1, unicorn]
uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.0
uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@7381e2081c60c745855a95646372165eae4de41a # v1.6.0
with:
upgrade-flavors: ${{ needs.check-flavor.outputs.upgrade-flavors }}
flavor: ${{ matrix.flavor }}
Expand Down
3 changes: 0 additions & 3 deletions .release-please-manifest.json

This file was deleted.

8 changes: 2 additions & 6 deletions bundle/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ kind: UDSBundle
metadata:
name: gitlab-test
description: A UDS bundle for deploying Gitlab and it's dependencies on a development cluster
# x-release-please-start-version
version: 17.6.2-uds.0
# x-release-please-end
version: dev

packages:
- name: minio-operator
Expand Down Expand Up @@ -88,9 +86,7 @@ packages:

- name: gitlab
path: ../
# x-release-please-start-version
ref: 17.6.2-uds.0
# x-release-please-end
ref: dev
overrides:
gitlab:
uds-gitlab-config:
Expand Down
24 changes: 0 additions & 24 deletions release-please-config.json

This file was deleted.

13 changes: 13 additions & 0 deletions releaser.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Copyright 2024 Defense Unicorns
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial

flavors:
- name: upstream
# renovate-uds: datasource=docker depName=registry.gitlab.com/gitlab-org/build/cng/gitlab-base extractVersion=^v(?<version>\d+\.\d+\.\d+)$
version: 17.6.2-uds.1
- name: registry1
# renovate-uds: datasource=docker depName=registry1.dso.mil/ironbank/gitlab/gitlab/gitlab-base
version: 17.6.2-uds.1
- name: unicorn
# renovate-uds: datasource=docker depName=registry.gitlab.com/gitlab-org/build/cng/gitlab-base extractVersion=^v(?<version>\d+\.\d+\.\d+)$
version: 17.6.2-uds.1
40 changes: 22 additions & 18 deletions tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,26 @@

includes:
- test: ./tasks/test.yaml
- create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/create.yaml
- publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/publish.yaml
- lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/lint.yaml
- pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/pull.yaml
- deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/deploy.yaml
- setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/setup.yaml
- actions: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/actions.yaml
- badge: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/badge.yaml
- upgrade: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/upgrade.yaml
- compliance: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/compliance.yaml
- create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.6.0/tasks/create.yaml
- publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.6.0/tasks/publish.yaml
- lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.6.0/tasks/lint.yaml
- pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.6.0/tasks/pull.yaml
- deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.6.0/tasks/deploy.yaml
- setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.6.0/tasks/setup.yaml
- actions: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.6.0/tasks/actions.yaml
- badge: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.6.0/tasks/badge.yaml
- upgrade: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.6.0/tasks/upgrade.yaml
- compliance: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.6.0/tasks/compliance.yaml

tasks:
- name: default
description: Create K3D Cluster with UDS-Core (Dev) and GitLab
actions:
- task: create-dev-package
- task: setup:k3d-test-cluster
with:
# we cannot use checkpoint here because of the extra ports needed for GitLab SSH tests
use_checkpoint: "false"
- task: create-deploy-test-bundle

- name: create-dev-package
Expand Down Expand Up @@ -53,6 +56,9 @@ tasks:
actions:
- task: create-dev-package
- task: setup:k3d-test-cluster
with:
# we cannot use checkpoint here because of the extra ports needed for GitLab SSH tests
use_checkpoint: "false"
- task: create-deploy-test-bundle
- task: compliance:validate

Expand All @@ -61,6 +67,9 @@ tasks:
actions:
- task: upgrade:create-latest-tag-bundle
- task: setup:k3d-test-cluster
with:
# we cannot use checkpoint here because of the extra ports needed for GitLab SSH tests
use_checkpoint: "false"
- task: deploy:test-bundle
- task: compliance:validate
- task: create-dev-package
Expand All @@ -75,19 +84,14 @@ tasks:
- task: create:package
- task: setup:k3d-test-cluster
if: ${{ or (ne .variables.FLAVOR "upstream") (ne .variables.ARCH "arm64") }}
with:
# we cannot use checkpoint here because of the extra ports needed for GitLab SSH tests
use_checkpoint: "false"
- task: create-deploy-test-bundle
if: ${{ or (ne .variables.FLAVOR "upstream") (ne .variables.ARCH "arm64") }}
- task: create:test-bundle
if: ${{ and (eq .variables.FLAVOR "upstream") (eq .variables.ARCH "arm64") }}
- description: Publish the package
task: publish:package
with:
# x-release-please-start-version
version: "17.6.2-uds.0"
# x-release-please-end
- description: Publish the bundle
task: publish:test-bundle
with:
# x-release-please-start-version
version: "17.6.2-uds.0"
# x-release-please-end
2 changes: 1 addition & 1 deletion tasks/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ tasks:
dir: tests/data
# Login, and create a project
- cmd: |
docker run --rm --ipc=host --net=host -e SSH_PUBLIC_KEY="$(cat ./data/gitlab-test-ssh-key.pub)" -e PROJECT_NAME="${PROJECT_NAME}" --mount type=bind,source="$(pwd)",target=/app mcr.microsoft.com/playwright:v1.43.1-jammy sh -c " \
docker run --rm --ipc=host --net=host -e SSH_PUBLIC_KEY="$(cat ./data/gitlab-test-ssh-key.pub)" -e PROJECT_NAME="${PROJECT_NAME}" --mount type=bind,source="$(pwd)",target=/app mcr.microsoft.com/playwright:v1.49.1-jammy sh -c " \
cd app && \
npm ci && \
npx playwright test \
Expand Down
58 changes: 32 additions & 26 deletions tests/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "uds-package-gitlab",
"license": "Apache-2.0",
"devDependencies": {
"@playwright/test": "^1.43.1",
"@types/node": "^20.12.12",
"@playwright/test": "^1.49.1",
"@types/node": "^22.0.0",
"typescript": "^5.4.5"
}
}
1 change: 0 additions & 1 deletion version.txt

This file was deleted.

Loading
Loading