Skip to content

Commit

Permalink
address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
zachariahmiller committed May 7, 2024
1 parent acbe2e5 commit 21c067a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 17 deletions.
9 changes: 4 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@
]
},
"yaml.schemas": {
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.1/uds.schema.json": [
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/uds.schema.json": [
"uds-bundle.yaml"
],
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.1/tasks.schema.json": [
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/tasks.schema.json": [
"tasks.yaml",
"tasks/**/*.yaml",
"src/**/validate.yaml"
],
"https://raw.githubusercontent.com/defenseunicorns/zarf/v0.32.6/zarf.schema.json": [
"https://raw.githubusercontent.com/defenseunicorns/zarf/v0.31.0/zarf.schema.json": [
"zarf.yaml"
]
},
Expand All @@ -40,4 +39,4 @@
"Sysctls",
"Velero"
]
}
}
1 change: 1 addition & 0 deletions docs/DEVELOPMENT_MAINTENANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ When changes are merged to the `main` branch, the Release Please will evaluate a
> TIP: Merging a PR should be done via a branch **"Squash and merge"**; this means that the commit message seen on this PR merge is what Release Please will use to determine a version bump.
When the auto generated Release Please PR is merged the following steps will automatically happen.

1) A new release will be created and tagged
10 changes: 0 additions & 10 deletions tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,13 @@ tasks:
spoof_release: "true"
- task: create:test-bundle

- name: test
description: Just test the health of Gitlab and Gitlab Runner deployments
actions:
- task: test:glr-run-check

- name: dev
description: Deploy gitlab-runner on existing cluster with existing gitlab
actions:
- task: create-glr-package
- task: create-glr-test-bundle
- task: deploy:test-bundle

- name: create-user
description: create doug user
actions:
- task: setup:create-doug-user

- name: doug-admin
description: Promote Doug to admin (requires running create-user and logging into gitlab ui first)
actions:
Expand Down
4 changes: 2 additions & 2 deletions test/journey/pipeline-run.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ test('test kicking off a pipeline run', async () => {
// Get the root password for GitLab
const rootPasswordSecret = await K8s(kind.Secret).InNamespace("gitlab").Get("gitlab-gitlab-initial-root-password")
const rootPassword = atob(rootPasswordSecret.data!.password)

const arch = process.env.UDS_ARCH
// Create a test repository in GitLab using Zarf
zarfExec(["package", "create", "package", "--confirm"]);
zarfExec([
"package",
"mirror-resources",
"zarf-package-gitlab-runner-test-*-0.0.1.tar.zst",
`zarf-package-gitlab-runner-test-${arch}-0.0.1.tar.zst`,
"--git-url", "https://gitlab.uds.dev/",
"--git-push-username", "root",
"--git-push-password", rootPassword,
Expand Down

0 comments on commit 21c067a

Please sign in to comment.