Fix various smaller errors due to refactoring

opendevstack · Oct 9, 2023 · f502d16 · f502d16
1 parent d00f31b
commit f502d16
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 153 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -28,12 +28,11 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        image: ["aqua-scan", "finish", "go-toolset", "gradle-toolset", "helm", "node16-npm-toolset", "node18-npm-toolset", "package-image", "pipeline-manager", "python-toolset", "sonar", "start"]
+        image: ["finish", "pipeline-manager", "start"]
     permissions:
       contents: read
       packages: write
       id-token: write
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -58,9 +57,9 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: build/package/Dockerfile.${{ matrix.image }}
+          file: build/images/Dockerfile.${{ matrix.image }}
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_BASE }}/ods-${{ matrix.image }}:${{ needs.setup.outputs.imageTag }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_BASE }}/${{ matrix.image }}:${{ needs.setup.outputs.imageTag }}
 
   release-chart:
     runs-on: ubuntu-latest

diff --git a/deploy/chart/templates/task-finish.yaml b/deploy/chart/templates/task-finish.yaml
@@ -19,7 +19,7 @@ spec:
       default: ''
   steps:
     - name: finish
-      # Image is built from build/package/Dockerfile.finish.
+      # Image is built from build/images/Dockerfile.finish.
       image: '{{.Values.imageRepository}}/finish:{{.Values.imageTag | default .Chart.AppVersion}}'
       env:
         - name: HOME

diff --git a/deploy/chart/templates/task-start.yaml b/deploy/chart/templates/task-start.yaml
@@ -75,7 +75,7 @@ spec:
       name: url
   steps:
     - name: start
-      # Image is built from build/package/Dockerfile.start.
+      # Image is built from build/images/Dockerfile.start.
       image: '{{.Values.imageRepository}}/start:{{.Values.imageTag | default .Chart.AppVersion}}'
       env:
         - name: HOME

diff --git a/docs/repository-layout.adoc b/docs/repository-layout.adoc
@@ -6,7 +6,7 @@ The most important pieces are:
 
 * **build/images**: `Dockerfile`s for the various container images in use. These images back Tekton tasks or the pipeline manager.
 * **cmd**: Main executables. These are installed (in different combinations) into the container images.
-* **deploy**: OpenShift/K8S resource definitions, such as `Task` resources. The tasks make use of the images built via `build/package` and released to ghcr.io. Their `script` calls an executables built from the `cmd` folder.
+* **deploy**: OpenShift/K8S resource definitions, such as `Task` resources. The tasks make use of the images built via `build/images` and released to ghcr.io. Their `script` calls an executables built from the `cmd` folder.
 * **docs**: Design and user documents
 * **internal/manager**: Implementation of the webhook receiver and pipeline manager - it creates and modifies the actual Tekton pipelines on the fly based on the config found in the repository triggering the webhook request.
 * **pkg**: Packages shared by the various main executables and the pipeline manager. These packages are the public interface and may be used outside this repo (e.g. by custom tasks). Example of packages are `bitbucket` (a Bitbucket Server API v1.0 client), `sonar` (a SonarQube client exposing API endpoints, scanner CLI and report CLI in one unified interface), `nexus` (a Nexus client for uploading, downloading and searching for assets) and `config` (the ODS configuration specification).

diff --git a/test/scripts/download-aqua-scanner_test.go b/test/scripts/download-aqua-scanner_test.go