[issue 136] - Adding a specific e2e script for the OpenShift CI perio…

…dic prow job (and minor fixes/cleanup)

.ci/openshift-ci/build-root/e2e-test-periodic.sh

@@ -0,0 +1,129 @@
+#!/bin/bash
+
+#!/usr/bin/env bash
+# exit immediately when a command fails
+set -e
+# avoid exiting with non-zero if any of the pipeline commands fail because we need retries for oc login
+#set -o pipefail
+# error on unset variables
+set -u
+# print each command before executing it
+set -x
+
+printenv KUBECONFIG
+printenv KUBEADMIN_PASSWORD_FILE
+
+oc get node
+oc config view
+
+export TEST_CLUSTER_URL=$(oc whoami --show-server)
+
+export SYSADMIN_USERNAME=kubeadmin
+export SYSADMIN_PASSWORD=$(cat "${KUBEADMIN_PASSWORD_FILE}")
+
+# note that for some reason it takes a few minutes for this to be loaded by OCP and authentication start working
+export TEST_ADMIN_USERNAME=tadmin
+export TEST_ADMIN_PASSWORD=adminpwd
+export TEST_USER_USERNAME=tuser
+export TEST_USER_PASSWORD=userpwd
+export HTPASSWD_FILE=users.htpasswd
+
+htpasswd -c -B -b $HTPASSWD_FILE $TEST_ADMIN_USERNAME $TEST_ADMIN_PASSWORD
+htpasswd -b $HTPASSWD_FILE $TEST_USER_USERNAME $TEST_USER_PASSWORD
+
+cat $HTPASSWD_FILE
+
+oc create secret generic htpass-secret --from-file=htpasswd=$HTPASSWD_FILE -n openshift-config
+oc patch OAuth cluster -p '{"spec": {"identityProviders": [{"htpasswd": {"fileData": {"name": "htpass-secret"}},"mappingMethod": "claim","name": "my_htpasswd_provider","type": "HTPasswd"}]}}' --type=merge
+
+# wait until authentication operator updates auth
+sleep 45 # wait until operator notices changes
+counter=0
+while [ "$(oc get clusteroperator authentication -o custom-columns=STATUS:.status.conditions[1].status | tail -1)" == "True" ]; do
+  sleep 5
+  echo Waiting for authentication operator to finish processing
+  ((counter=counter+1))
+  if [ "$counter" == "200" ]; then
+    echo "Timeout waiting for authentication operator."
+    exit 1
+  fi
+done
+
+counter=0
+until [[ "$(oc login --insecure-skip-tls-verify ${TEST_CLUSTER_URL} -u ${TEST_ADMIN_USERNAME} -p ${TEST_ADMIN_PASSWORD})" =~ "Login successful" ]] || [[ counter++ -ge 80 ]]
+do
+  sleep 5
+done
+export ADMIN_TOKEN=$(oc whoami -t)
+
+counter=0
+until [[ "$(oc login --insecure-skip-tls-verify ${TEST_CLUSTER_URL} -u ${TEST_USER_USERNAME} -p ${TEST_USER_PASSWORD})" =~ "Login successful" ]] || [[ counter++ -ge 80 ]]
+do
+  sleep 5
+done
+export USER_TOKEN=$(oc whoami -t)
+
+oc login --insecure-skip-tls-verify "${TEST_CLUSTER_URL}" -u ${SYSADMIN_USERNAME} -p "${SYSADMIN_PASSWORD}"
+oc adm policy add-cluster-role-to-user cluster-admin ${TEST_ADMIN_USERNAME}
+# We need to do this since InfinispanOperatorProvisionerTest would fail unless the master account is made
+# cluster-admin as well, see https://github.com/Intersmash/intersmash/issues/48
+oc adm policy add-cluster-role-to-user cluster-admin ${TEST_USER_USERNAME}
+
+export TEST_NAMESPACE=intersmash-prod
+
+export PULL_SECRET_PATH_REDHAT_REGISTRY_IO=/var/run/registry-redhat-io-pull-secret
+export PULL_SECRET_FILE_REDHAT_REGISTRY_IO=${PULL_SECRET_PATH_REDHAT_REGISTRY_IO}/pull-secret
+export PULL_SECRET_REDHAT_REGISTRY_IO=$(cat "${PULL_SECRET_FILE_REDHAT_REGISTRY_IO}")
+
+cat >> test.properties <<EOL
+xtf.openshift.url=${TEST_CLUSTER_URL}
+xtf.openshift.namespace=${TEST_NAMESPACE}
+xtf.bm.namespace=${TEST_NAMESPACE}-builds
+xtf.openshift.admin.username=${TEST_ADMIN_USERNAME}
+xtf.openshift.admin.password=${TEST_ADMIN_PASSWORD}
+xtf.openshift.admin.token=${ADMIN_TOKEN}
+xtf.openshift.master.username=${TEST_USER_USERNAME}
+xtf.openshift.master.password=${TEST_USER_PASSWORD}
+xtf.openshift.master.token=${USER_TOKEN}
+xtf.openshift.admin.kubeconfig=${KUBECONFIG}
+xtf.openshift.master.kubeconfig=${KUBECONFIG}
+xtf.openshift.pullsecret=${PULL_SECRET_REDHAT_REGISTRY_IO}
+
+EOL
+
+cat test.properties
+
+mkdir local-repo-prod
+mvn clean install -Dmaven.repo.local=./local-repo-prod -DskipTests -Pts.wildfly.target-distribution.eap
+mvn test -Dmaven.repo.local=./local-repo-prod -pl testsuite/integration-tests -Pts.execution-profile.prod,ts.wildfly.target-distribution.eap \
+ -Dintersmash.wildfly.image=registry.redhat.io/jboss-eap-8-tech-preview/eap8-openjdk17-builder-openshift-rhel8:1.0.0.Beta \
+ -Dintersmash.wildfly.runtime.image=registry.redhat.io/jboss-eap-8-tech-preview/eap8-openjdk17-runtime-openshift-rhel8:1.0.0.Beta \
+ -Dintersmash.wildfly.operators.catalog_source=redhat-operators \
+ -Dintersmash.wildfly.operators.package_manifest=eap \
+ -Dintersmash.wildfly.operators.channel=stable \
+ -Dintersmash.wildfly.operators.index_image='' \
+ -Dintersmash.wildfly.helm.charts.repo=https://github.com/jbossas/eap-charts.git \
+ -Dintersmash.wildfly.helm.charts.branch=eap8-1.1.0 \
+ -Dintersmash.wildfly.helm.charts.name=eap8 \
+ -Dintersmash.eap7.image=registry.redhat.io/jboss-eap-7/eap74-openjdk17-openshift-rhel8:latest \
+ -Dintersmash.eap7.runtime.image=registry.redhat.io/jboss-eap-7/eap74-openjdk17-runtime-openshift-rhel8:latest \
+ -Dintersmash.eap7.templates.base.url=https://raw.githubusercontent.com/jboss-container-images/jboss-eap-openshift-templates/eap74/ \
+ -Dintersmash.eap7.templates.path=templates/ \
+ -Dintersmash.activemq.image=registry.redhat.io/amq7/amq-broker-rhel8:7.11.0 \
+ -Dintersmash.activemq.init.image=registry.redhat.io/amq7/amq-broker-init-rhel8:7.11.0 \
+ -Dintersmash.activemq.operators.catalog_source=redhat-operators \
+ -Dintersmash.activemq.operators.package_manifest=amq-broker-rhel8 \
+ -Dintersmash.activemq.operators.channel=7.11.x \
+ -Dintersmash.activemq.operators.index_image='' \
+ -Dintersmash.rhsso.image=registry.redhat.io/rh-sso-7/sso76-openshift-rhel8:latest \
+ -Dintersmash.rhsso.operators.catalog_source=redhat-operators \
+ -Dintersmash.rhsso.operators.package_manifest=rhsso-operator \
+ -Dintersmash.rhsso.templates=https://raw.githubusercontent.com/jboss-container-images/redhat-sso-7-openshift-image/sso76-dev/templates/ \
+ -Dintersmash.infinispan.image=registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:latest \
+ -Dintersmash.infinispan.operators.catalog_source=redhat-operators \
+ -Dintersmash.infinispan.operators.package_manifest=datagrid \
+ -Dintersmash.kafka.operators.catalog_source=redhat-operators \
+ -Dintersmash.kafka.operators.package_manifest=amq-streams \
+ -Dintersmash.kafka.operators.channel=stable \
+ -Dintersmash.hyperfoil.operators.catalog_source=community-operators \
+ -Dintersmash.hyperfoil.operators.package_manifest=hyperfoil-bundle

.ci/openshift-ci/build-root/e2e-test-prod.sh

@@ -16,6 +16,15 @@ printenv KUBEADMIN_PASSWORD_FILE
 oc get node
 oc config view
 
+if [[ $JOB_SPEC =~ author\"\:\"(.*)\"\,\"sha ]]
+then
+  export INTERSMASH_PR_AUTHOR="${BASH_REMATCH[1]}"
+  echo "[DEBUG] PR author: $INTERSMASH_PR_AUTHOR"
+else
+  echo "[ERROR] Error getting the PR author from: $JOB_SPEC"
+  exit 1
+fi
+
 export TEST_CLUSTER_URL=$(oc whoami --show-server)
 
 export SYSADMIN_USERNAME=kubeadmin
@@ -95,14 +104,6 @@ cat test.properties
 
 mkdir local-repo-prod
 mvn clean install -Dmaven.repo.local=./local-repo-prod -DskipTests -Pts.wildfly.target-distribution.eap
-if [[ $JOB_SPEC =~ author\"\:\"(.*)\"\,\"sha ]]
-then
-  export INTERSMASH_PR_AUTHOR="${BASH_REMATCH[1]}"
-  echo "[DEBUG] PR author: $INTERSMASH_PR_AUTHOR"
-else
-  echo "[ERROR] Error getting the PR author from: $JSON_SPEC"
-  exit 1
-fi
 mvn test -Dmaven.repo.local=./local-repo-prod -pl testsuite/integration-tests -Pts.execution-profile.prod,ts.wildfly.target-distribution.eap \
  -Dintersmash.deployments.repository.url="https://github.com/${INTERSMASH_PR_AUTHOR}/${REPO_NAME}.git" \
  -Dintersmash.deployments.repository.ref="${PULL_HEAD_REF}" \

.ci/openshift-ci/build-root/e2e-test.sh

@@ -99,14 +99,6 @@ cat test.properties
 
 mkdir local-repo-community
 mvn clean install -Dmaven.repo.local=./local-repo-community -DskipTests
-if [[ $JOB_SPEC =~ author\"\:\"(.*)\"\,\"sha ]]
-then
-  export INTERSMASH_PR_AUTHOR="${BASH_REMATCH[1]}"
-  echo "[DEBUG] PR author: $INTERSMASH_PR_AUTHOR"
-else
-  echo "[ERROR] Error getting the PR author from: $JSON_SPEC"
-  exit 1
-fi
 mvn test -Dmaven.repo.local=./local-repo-community -pl testsuite/integration-tests \
  -Dintersmash.deployments.repository.url="https://github.com/${INTERSMASH_PR_AUTHOR}/${REPO_NAME}.git" \
  -Dintersmash.deployments.repository.ref="${PULL_HEAD_REF}"