Minor fixes

README.md

@@ -52,7 +52,7 @@ For OpenShift Pipelines releases and its relationship to Tekton and OpenShift ve
 
 | ods-pipeline | OpenShift Pipelines | ODS Core/Quickstarters |
 |---|---|---|
-| [0.15](https://github.com/opendevstack/ods-pipeline/releases/tag/v0.15.0) | 1.12 | 4.x |
+| [0.15](https://github.com/opendevstack/ods-pipeline/releases/tag/v0.15.0) | 1.12 - 1.14 | 4.x |
 | [0.14](https://github.com/opendevstack/ods-pipeline/releases/tag/v0.14.0) | 1.12 | 4.x |
 | [0.13](https://github.com/opendevstack/ods-pipeline/releases/tag/v0.13.2) | 1.9 | 4.x |
 

build/images/Dockerfile.finish

@@ -15,7 +15,7 @@ RUN cd cmd/finish && CGO_ENABLED=0 go build -o /usr/local/bin/ods-finish
 
 # Final image
 # ubi-micro cannot be used as it misses the ca-certificates package.
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
 COPY --from=builder /usr/local/bin/ods-finish /usr/local/bin/ods-finish
 VOLUME /workspace/source
 USER 1001

build/images/Dockerfile.pipeline-manager

@@ -15,7 +15,7 @@ RUN cd cmd/pipeline-manager && CGO_ENABLED=0 go build -o /usr/local/bin/pipeline
 
 # Final image
 # ubi-micro cannot be used as it misses the ca-certificates package.
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
 COPY --from=builder /usr/local/bin/pipeline-manager /usr/local/bin/pipeline-manager
 EXPOSE 8080
 CMD pipeline-manager

build/images/Dockerfile.start

@@ -27,7 +27,7 @@ RUN cd /tmp \
     && git lfs version
 
 # Final image
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9
 
 ENV GIT_VERSION=2.39 \
     OPENSSH_CLIENTS_VERSION=8.0

deploy/chart/templates/configmap-bitbucket.yaml

@@ -5,5 +5,5 @@ metadata:
   labels:
     {{- include "chart.labels" . | nindent 4}}
 data:
-  url: '{{required "bitbucketUrl is required" .Values.bitbucketUrl | trimSuffix "/"}}'
-  repoBase: '{{required "bitbucketUrl is required" .Values.bitbucketUrl | trimSuffix "/"}}/scm'
+  url: '{{.Values.bitbucketUrl | trimSuffix "/"}}'
+  repoBase: '{{.Values.bitbucketUrl | trimSuffix "/"}}/scm'

deploy/chart/templates/configmap-nexus.yaml

@@ -5,4 +5,4 @@ metadata:
   labels:
     {{- include "chart.labels" . | nindent 4}}
 data:
-  url: '{{required "nexusUrl is required" .Values.nexusUrl | trimSuffix "/"}}'
+  url: '{{.Values.nexusUrl | trimSuffix "/"}}'

docs/design/software-design-specification.adoc

@@ -235,7 +235,7 @@ a| The script installs the Helm chart located in `deploy/chart`. Further, it:
 
 | SDS-EXT-2
 | Red Hat Universal Base Image 8 Minimal
-| 8.4
+| 8.9
 | Universal Base Image Minimal is a stripped down image that uses microdnf as a package manager. It is maintained by Red Hat and updated regularly.
 | https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8
 

docs/promotion.adoc

@@ -44,8 +44,7 @@ pipelines:
   tasks:
   - name: deploy
 - triggers:
-  - branches: ["*", "*/*"]
-    params:
+  - params:
     - { name: finish.artifact-target, value: "my-nexus-repo" }
     - { name: deploy.namespace, value: "prod-env" }
     - { name: deploy.diff-only, value: "true" }

pkg/odstasktest/assertions.go

@@ -10,6 +10,7 @@ import (
 // AssertFilesExist checks that all files named by wantFiles exist in wsDir.
 // Any files that do not exist will report a test error.
 func AssertFilesExist(t *testing.T, wsDir string, wantFiles ...string) {
+	t.Helper()
 	for _, wf := range wantFiles {
 		filename := filepath.Join(wsDir, wf)
 		if _, err := os.Stat(filename); os.IsNotExist(err) {
@@ -21,6 +22,7 @@ func AssertFilesExist(t *testing.T, wsDir string, wantFiles ...string) {
 // AssertFileContent checks that the file named by filename in the directory
 // wsDir has the exact context specified by want.
 func AssertFileContent(t *testing.T, wsDir, filename, want string) {
+	t.Helper()
 	got, err := getTrimmedFileContent(filepath.Join(wsDir, filename))
 	if err != nil {
 		t.Errorf("get content of %s: %s", filename, err)
@@ -34,6 +36,7 @@ func AssertFileContent(t *testing.T, wsDir, filename, want string) {
 // AssertFileContentContains checks that the file named by filename in the directory
 // wsDir contains all of wantContains.
 func AssertFileContentContains(t *testing.T, wsDir, filename string, wantContains ...string) {
+	t.Helper()
 	content, err := os.ReadFile(filepath.Join(wsDir, filename))
 	got := string(content)
 	if err != nil {

scripts/install-tekton-pipelines.sh

@@ -4,9 +4,9 @@ set -eu
 kube_context="--context kind-ods-pipeline"
 kubectl_bin="kubectl $kube_context"
 
-# Tekton version is aligned with Red Hat OpenShift Pipelines General Availability 1.12.
-# See https://docs.openshift.com/container-platform/latest/cicd/pipelines/op-release-notes.html.
-tkn_version="v0.50.1"
+# Tekton version is aligned with Red Hat OpenShift Pipelines General Availability 1.14.
+# See https://docs.openshift.com/pipelines/1.14/about/op-release-notes.html.
+tkn_version="v0.56.2"
 tkn_dashboard_version="v0.17.0"
 
 install_tkn_dashboard="false"

scripts/kind-with-registry.sh

@@ -30,9 +30,9 @@ recreate_kind_cluster="false"
 registry_port="5000"
 kind_mount_path="/tmp/ods-pipeline/kind-mount"
 
-# K8S version is aligned with OpenShift GA 4.11.
-# See https://docs.openshift.com/container-platform/4.11/release_notes/ocp-4-11-release-notes.html
-k8s_version="v1.24.7"
+# K8S version is aligned with OpenShift GA 4.13.
+# See https://docs.openshift.com/container-platform/4.13/release_notes/ocp-4-13-release-notes.html
+k8s_version="v1.26.14"
 
 while [ "$#" -gt 0 ]; do
     case $1 in
@@ -55,12 +55,12 @@ reg_ip_selector='{{.NetworkSettings.Networks.kind.IPAddress}}'
 reg_network='kind'
 
 # create registry container unless it already exists
-running="$(docker inspect -f '{{.State.Running}}' "${registry_name}" 2>/dev/null || true)"
+running="$(docker container inspect -f '{{.State.Running}}' "${registry_name}" 2>/dev/null || true)"
 
 # If the registry already exists, but is in the wrong network, we have to
 # re-create it.
 if [ "${running}" = 'true' ]; then
-  reg_ip="$(docker inspect -f ${reg_ip_selector} "${registry_name}")"
+  reg_ip="$(docker container inspect -f ${reg_ip_selector} "${registry_name}")"
   if [ "${reg_ip}" = '' ]; then
     docker kill "${registry_name}"
     docker rm "${registry_name}"
@@ -73,15 +73,15 @@ if [ "${running}" != 'true' ]; then
   if [ "${net_driver}" != "bridge" ]; then
     docker network create "${reg_network}"
   fi
-  if docker inspect "${registry_name}" >/dev/null 2>&1; then
+  if docker container inspect "${registry_name}" >/dev/null 2>&1; then
     docker rm "${registry_name}"
   fi
   docker run \
     -d --restart=always -p "${registry_port}:5000" --name "${registry_name}" --net "${reg_network}" \
     registry:2
 fi
 
-reg_ip="$(docker inspect -f ${reg_ip_selector} "${registry_name}")"
+reg_ip="$(docker container inspect -f ${reg_ip_selector} "${registry_name}")"
 if [ "${reg_ip}" = "" ]; then
     echo "Error creating registry: no IPAddress found at: ${reg_ip_selector}"
     exit 1

scripts/run-bitbucket.sh

@@ -29,7 +29,7 @@ while [ "$#" -gt 0 ]; do
 esac; shift; done
 
 if [ "${reuse}" = "true" ]; then
-    if ! docker inspect ${BITBUCKET_SERVER_CONTAINER_NAME} &> /dev/null; then
+    if ! docker container inspect ${BITBUCKET_SERVER_CONTAINER_NAME} &> /dev/null; then
         echo "No existing Bitbucket container ${BITBUCKET_SERVER_CONTAINER_NAME} found ..."
     else
         echo "Reusing existing Bitbucket container ${BITBUCKET_SERVER_CONTAINER_NAME} ..."

scripts/run-nexus.sh

@@ -33,7 +33,7 @@ while [ "$#" -gt 0 ]; do
 esac; shift; done
 
 if [ "${reuse}" = "true" ]; then
-    if ! docker inspect ${CONTAINER_NAME} &> /dev/null; then
+    if ! docker container inspect ${CONTAINER_NAME} &> /dev/null; then
         echo "No existing Nexus container ${CONTAINER_NAME} found ..."
     else
         echo "Reusing existing Nexus container ${CONTAINER_NAME} ..."

scripts/run-sonarqube.sh

@@ -30,7 +30,7 @@ while [ "$#" -gt 0 ]; do
 esac; shift; done
 
 if [ "${reuse}" = "true" ]; then
-    if [ "$(docker inspect ${CONTAINER_NAME} -f '{{.State.Running}}')" = "true" ]; then
+    if [ "$(docker container inspect ${CONTAINER_NAME} -f '{{.State.Running}}')" = "true" ]; then
         echo "Reusing running SonarQube container ${CONTAINER_NAME} ..."
         exit 0
     else