try amending E2E tests

- remove need of make, leverage existing manifest from release - use UBI8 UBI image again - remove installing go
RedHatInsights · Dec 9, 2024 · 7b4c9a3 · 7b4c9a3
1 parent b1a8a8a
commit 7b4c9a3
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/.tekton/clowder-pull-request.yaml b/.tekton/clowder-pull-request.yaml
@@ -33,7 +33,7 @@ spec:
   - name: path-context
     value: .
   - name: prefetch-input
-    value: 
+    value:
     - {"type": "gomod", "path": "."}
     - {"type": "gomod", "path": "./deps/controller-gen"}
     - {"type": "gomod", "path": "./deps/kustomize"}
@@ -299,7 +299,7 @@ spec:
               - use
               - $(params.SOURCE_ARTIFACT)=/var/workdir/source
           - name: e2e-tests
-            image: registry.access.redhat.com/ubi8/go-toolset:1.22.7-5.1731464728
+            image: registry.access.redhat.com/ubi8/ubi:8.10-1132.1732635159
             workingDir: /var/workdir/source
             env:
               - name: MINIKUBE_HOST
@@ -311,7 +311,7 @@ spec:
                 valueFrom:
                   secretKeyRef:
                     name: minikube-ssh-key
-                    key: MINIKUBE_USER 
+                    key: MINIKUBE_USER
               - name: MINIKUBE_SSH_KEY
                 valueFrom:
                   secretKeyRef:
@@ -322,7 +322,8 @@ spec:
                   secretKeyRef:
                     name: minikube-ssh-key
                     key: MINIKUBE_ROOTDIR
-            script: set -e && ./ci/konflux_minikube_e2e_tests.sh
+            # FIXME: this should be handled from the script itself
+            script: set -ex && dnf install -y git openssh-clients python3.12 && ci/konflux_minikube_e2e_tests.sh
         volumes:
           # New volume to store a copy of the source code accessible only to this Task.
           - name: workdir

diff --git a/.tekton/clowder-push.yaml b/.tekton/clowder-push.yaml
@@ -289,7 +289,7 @@ spec:
               - use
               - $(params.SOURCE_ARTIFACT)=/var/workdir/source
           - name: e2e-tests
-            image: registry.access.redhat.com/ubi8/go-toolset:1.22.7-5.1731464728
+            image: registry.access.redhat.com/ubi8/ubi:8.10-1132.1732635159
             workingDir: /var/workdir/source
             env:
               - name: MINIKUBE_HOST
@@ -301,7 +301,7 @@ spec:
                 valueFrom:
                   secretKeyRef:
                     name: minikube-ssh-key
-                    key: MINIKUBE_USER 
+                    key: MINIKUBE_USER
               - name: MINIKUBE_SSH_KEY
                 valueFrom:
                   secretKeyRef:
@@ -312,7 +312,8 @@ spec:
                   secretKeyRef:
                     name: minikube-ssh-key
                     key: MINIKUBE_ROOTDIR
-            script: set -e && ./ci/konflux_minikube_e2e_tests.sh
+            # FIXME: this should be handled from the script itself
+            script: set -ex && dnf install -y git openssh-clients python3.12 && ci/konflux_minikube_e2e_tests.sh
         volumes:
           # New volume to store a copy of the source code accessible only to this Task.
           - name: workdir
@@ -557,4 +558,4 @@ spec:
   - name: git-auth
     secret:
       secretName: '{{ git_auth_secret }}'
-status: {}
+status: {}
diff --git a/build/kube_setup.sh b/build/kube_setup.sh
@@ -26,14 +26,14 @@ if ! command -v jq; then
     exit 1
 fi
 
-# GO is required for yq, check if go is installed
-echo "*** Checking for 'go' ..."
-if ! command -v go; then
-    echo "*** 'go' not found in path. Please install go with:"
-    [[ $PLATFORM == "Darwin" ]] && echo "  'brew install golang' or the instructions at https://golang.org/doc/install" \
-        || echo "  sudo dnf install golang"
-    exit 1
-fi
+## GO is required for yq, check if go is installed
+#echo "*** Checking for 'go' ..."
+#if ! command -v go; then
+#    echo "*** 'go' not found in path. Please install go with:"
+#    [[ $PLATFORM == "Darwin" ]] && echo "  'brew install golang' or the instructions at https://golang.org/doc/install" \
+#        || echo "  sudo dnf install golang"
+#    exit 1
+#fi
 
 # kubectl is required for interactions with the cluster.
 if [ -n "${KUBECTL_CMD}" ]; then
@@ -52,11 +52,11 @@ source build/.build_venv/bin/activate
 pip install --upgrade pip setuptools wheel
 pip install pyyaml
 
-GO_BIN_PATH="$(go env GOPATH)/bin"
+#GO_BIN_PATH="$(go env GOPATH)/bin"
+#
+#export PATH="$PATH:$GO_BIN_PATH"
 
-export PATH="$PATH:$GO_BIN_PATH"
-
-declare -a array BG_PIDS=()
+declare -a BG_PIDS=()
 
 ROOT_DIR=$(pwd)
 DOWNLOAD_DIR="build/operator_bundles"
@@ -188,7 +188,6 @@ function install_prometheus_operator {
     cd "$ROOT_DIR"
 }
 
-
 function install_cyndi_operator {
     OPERATOR_NS=cyndi-operator-system
     DEPLOYMENT=cyndi-operator-controller-manager

diff --git a/ci/konflux_minikube_e2e_tests.sh b/ci/konflux_minikube_e2e_tests.sh
@@ -4,7 +4,6 @@ set -exv
 
 mkdir -p /var/workdir/bin
 cd /var/workdir/bin
-ln -s /usr/libexec/platform-python3.6 python3
 
 export KUBEBUILDER_ASSETS=/var/workdir/testbin/bin
 
@@ -71,7 +70,7 @@ preferences: {}
 EOM
 
 export PATH="$KUBEBUILDER_ASSETS:$PATH"
-export PATH="/root/go/bin:$PATH"
+#export PATH="/root/go/bin:$PATH"
 
 export KUBECONFIG=$PWD/kube-config
 export KUBECTL_CMD="kubectl "
@@ -84,11 +83,11 @@ export IMAGE_TAG=`git rev-parse --short=8 HEAD`
 
 $KUBECTL_CMD create namespace clowder-system
 
-mkdir artifacts
+#mkdir artifacts
+#
+#make release
 
-make release
-
-cat manifest.yaml > artifacts/manifest.yaml
+#cat manifest.yaml > artifacts/manifest.yaml
 
 $KUBECTL_CMD apply -f manifest.yaml --validate=false -n clowder-system
 
@@ -125,4 +124,4 @@ for pod in $STRIMZI_PODS; do
 done
 set -e
 
-exit $KUTTL_RESULT
+exit $KUTTL_RESULT