Draft PR for review comments of infraclouds contributions

.build/build-jars.sh

@@ -19,7 +19,7 @@
 
 # variables, with defaults
 [ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname "$0")/..)"
-
+echo "$CASSANDRA_DIR from build_jar"
 # pre-conditions
 command -v ant >/dev/null 2>&1 || { echo >&2 "ant needs to be installed"; exit 1; }
 [ -d "${CASSANDRA_DIR}" ] || { echo >&2 "Directory ${CASSANDRA_DIR} must exist"; exit 1; }

.build/docker/_docker_run.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -28,9 +28,10 @@
 
 # variables, with defaults
 [ "x${cassandra_dir}" != "x" ] || cassandra_dir="$(readlink -f $(dirname "$0")/../..)"
+#[ "x${cassandra_dir}" != "x" ] || cassandra_dir="$(readlink -f $(dirname "$0"))"
 [ "x${build_dir}" != "x" ] || build_dir="${cassandra_dir}/build"
 [ -d "${build_dir}" ] || { mkdir -p "${build_dir}" ; }
-
+echo "$CASSANDRA_DIR from _docker_run"
 java_version_default=`grep 'property\s*name="java.default"' ${cassandra_dir}/build.xml |sed -ne 's/.*value="\([^"]*\)".*/\1/p'`
 java_version_supported=`grep 'property\s*name="java.supported"' ${cassandra_dir}/build.xml |sed -ne 's/.*value="\([^"]*\)".*/\1/p'`
 
@@ -111,22 +112,34 @@ container_name="cassandra_${dockerfile/.docker/}_${un_script_name}_jdk${java_ver
 #  change ant's build directory to $DIST_DIR
 #  set java to java_version
 #  execute the run_script
+# docker_command="export ANT_OPTS=\"-Dbuild.dir=\${DIST_DIR} ${CASSANDRA_DOCKER_ANT_OPTS}\" ; \
+#                 source \${CASSANDRA_DIR}/.build/docker/_set_java.sh ${java_version} ; \
+#                 \${CASSANDRA_DIR}/.build/${run_script} ${@:4} ; exit \$? "
+
 docker_command="export ANT_OPTS=\"-Dbuild.dir=\${DIST_DIR} ${CASSANDRA_DOCKER_ANT_OPTS}\" ; \
-                source \${CASSANDRA_DIR}/.build/docker/_set_java.sh ${java_version} ; \
-                \${CASSANDRA_DIR}/.build/${run_script} ${@:4} ; exit \$? "
+                source /home/build/cassandra/cassandra/.build/docker/_set_java.sh ${java_version} ; \
+                /home/build/cassandra/.build/${run_script} ${@:4} ; exit \$? "
 
 # run without the default seccomp profile
 # re-use the host's maven repository
+# container_id=$(docker run --name ${container_name} -d --security-opt seccomp=unconfined --rm \
+#     -v "${cassandra_dir}":/home/build/cassandra -v ~/.m2/repository/:/home/build/.m2/repository/ -v "${build_dir}":/dist \
+#     ${docker_volume_opt} \
+#     ${image_name} sleep 1h)
 container_id=$(docker run --name ${container_name} -d --security-opt seccomp=unconfined --rm \
     -v "${cassandra_dir}":/home/build/cassandra -v ~/.m2/repository/:/home/build/.m2/repository/ -v "${build_dir}":/dist \
     ${docker_volume_opt} \
     ${image_name} sleep 1h)
 
-echo "Running container ${container_name} ${container_id}"
 
-docker exec --user root ${container_name} bash -c "\${CASSANDRA_DIR}/.build/docker/_create_user.sh build $(id -u) $(id -g)"
+echo "Running container ${container_name} ${container_id}"
+#sleep 3600
+#docker exec --user root ${container_name} bash -c "\${CASSANDRA_DIR}/.build/docker/_create_user.sh build $(id -u) $(id -g)"
+docker exec --user root ${container_name} bash -c "/home/build/cassandra/.build/docker/_create_user.sh build $(id -u) $(id -g)"
 docker exec --user build ${container_name} bash -c "${docker_command}"
 RETURN=$?
+current_build_dir=$(basename "${build_dir}")
+docker cp ${container_name}:"/home/build/cassandra/build/${current_build_dir}" /home/jenkins/agent/workspace/k8s-e2e/build
 
 docker stop ${container_name} >/dev/null
 popd >/dev/null

.build/docker/_set_java.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -e -x
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -24,7 +24,8 @@
 # variables, with defaults
 [ "x${CASSANDRA_DIR}" != "x" ] || { CASSANDRA_DIR="$(pwd)"; }
 [ -d "${CASSANDRA_DIR}" ] || { echo >&2 "Directory ${CASSANDRA_DIR} must exist"; exit 1; }
-
+echo "$CASSANDRA_DIR from _set_java"
+echo $(pwd)
 # pre-conditions
 [ -f "${CASSANDRA_DIR}/build.xml" ] || { echo >&2 "${CASSANDRA_DIR}/build.xml must exist"; exit 1; }
 

.build/docker/agent-build.docker

@@ -0,0 +1,39 @@
+# Use Alpine Linux as the base image
+FROM jenkins/inbound-agent:3148.v532a_7e715ee3-4
+
+USER root
+RUN apt-get update
+RUN apt-get install xz-utils -y 
+RUN apt-get install bc -y
+RUN apt-get update
+RUN apt-get install coreutils -y
+
+RUN apt-get update && \
+    apt-get install -y openjdk-11-jdk openjdk-17-jdk && \
+    update-alternatives --set java /usr/lib/jvm/java-11-openjdk-amd64/bin/java && \
+    update-alternatives --set javac /usr/lib/jvm/java-11-openjdk-amd64/bin/javac && \
+    update-alternatives --install /usr/local/bin/jdk_11 java /usr/lib/jvm/java-11-openjdk-amd64/bin/java 1 && \
+    update-alternatives --install /usr/local/bin/jdk_17 java /usr/lib/jvm/java-17-openjdk-amd64/bin/java 1
+
+# Install Docker
+RUN apt-get install -y gnupg
+# Install Docker for Debian Bullseye
+RUN apt-get update && \
+    apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release && \
+    curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
+    echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list && \
+    apt-get update && \
+    apt-get install -y docker-ce docker-ce-cli containerd.io
+
+#VOLUME /var/run/docker.sock
+RUN usermod -aG docker jenkins
+#RUN chown -R 1000:1000 /var/run/docker.sock
+
+USER jenkins
+
+
+
+
+
+
+

.build/docker/run-tests.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash +x
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -82,7 +82,6 @@ dockerfile="ubuntu2004_test.docker"
 image_tag="$(md5sum docker/${dockerfile} | cut -d' ' -f1)"
 image_name="apache/cassandra-${dockerfile/.docker/}:${image_tag}"
 docker_mounts="-v ${cassandra_dir}:/home/cassandra/cassandra -v "${build_dir}":/home/cassandra/cassandra/build -v ${HOME}/.m2/repository:/home/cassandra/.m2/repository"
-
 # Look for existing docker image, otherwise build
 if ! ( [[ "$(docker images -q ${image_name} 2>/dev/null)" != "" ]] ) ; then
   # try docker login to increase dockerhub rate limits
@@ -202,14 +201,18 @@ docker_command="source \${CASSANDRA_DIR}/.build/docker/_set_java.sh ${java_versi
 docker_id=$(docker run --name ${container_name} ${docker_flags} ${docker_mounts} ${docker_volume_opt} ${image_name} sleep 4h)
 
 echo "Running container ${container_name} ${docker_id}"
+#sleep 600
 
 docker exec --user root ${container_name} bash -c "\${CASSANDRA_DIR}/.build/docker/_create_user.sh cassandra $(id -u) $(id -g)" | tee -a ${logfile}
 docker exec --user root ${container_name} update-alternatives --set python /usr/bin/python${python_version} | tee -a ${logfile}
 
+docker cp /home/jenkins/agent/workspace/k8s-e2e/build ${container_name}:/home/cassandra/cassandra
+
 # capture logs and pid for container
 docker exec --user cassandra ${container_name} bash -c "${docker_command}" | tee -a ${logfile}
 status=$?
-
+docker cp ${container_name}:/home/cassandra/cassandra/build/test/output /home/jenkins/agent/workspace/k8s-e2e/build/test
+docker exec --user cassandra ${container_name} bash -c "mkdir -p /home/cassandra/cassandra/result/1/${target} && cp -r /home/cassandra/cassandra/build/test/output /home/cassandra/cassandra/result/1/${target}"
 if [ "$status" -ne 0 ] ; then
     echo "${docker_id} failed (${status}), debug…"
     docker inspect ${docker_id}
@@ -223,7 +226,7 @@ if [ "$status" -ne 0 ] ; then
     echo "Failure."
 fi
 # docker stop in background, ignore errors
-( nohup docker stop ${docker_id} >/dev/null 2>/dev/null & )
+#( nohup docker stop ${docker_id} >/dev/null 2>/dev/null & )
 
 xz -f ${logfile} 2>/dev/null
 

.build/jenkins-deployment.yaml

@@ -0,0 +1,112 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: jenkins-operator-user-configuration
+data:
+  1-system-message.yaml: |
+      tool:
+        jdk:
+          installations:
+            - name: jdk_11_latest
+              home: "/usr/bin/jdk_11/bin/java"
+            - name: jdk_17_latest
+              home: "/usr/bin/jdk_17/bin/java"
+---  
+apiVersion: jenkins.io/v1alpha2
+kind: Jenkins
+metadata:
+  name: example
+spec:
+  configurationAsCode:
+    configurations:
+    - name: jenkins-operator-user-configuration
+    secret:
+      name: ""
+  groovyScripts:
+    configurations: []
+    secret:
+      name: ""
+  service:
+    type: ClusterIP
+    port: 8080
+  jenkinsAPISettings:
+    authorizationStrategy: createUser
+  master:
+    plugins:
+    - name: ws-cleanup
+      version: "0.45"
+    - name: javadoc
+      version: "243.vb_b_503b_b_45537"
+    - name: description-setter
+      version: "1.10"
+    - name: throttle-concurrents
+      version: "2.14"
+    - name: test-stability
+      version: "2.3"
+    - name: postbuildscript
+      version: "3.2.0-550.v88192b_d3e922"
+    - name: github
+      version: "1.37.3"
+    - name: timestamper
+      version: "1.26"
+    - name: openJDK-native-plugin
+      version: "1.7"
+    basePlugins:
+    - name: kubernetes
+      version: "4029.v5712230ccb_f8"
+    - name: workflow-job
+      version: "1342.v046651d5b_dfe"
+    - name: workflow-aggregator
+      version: "596.v8c21c963d92d"
+    - name: git
+      version: "5.2.0"
+    - name: job-dsl
+      version: "1.84"
+    - name: configuration-as-code
+      version: "1700.v6f448841296e"
+    - name: kubernetes-credentials-provider
+      version: "1.225.v14f9e6b_28f53"
+    disableCSRFProtection: false
+    containers:
+      - name: jenkins-master
+        image: jenkins/jenkins:2.414.1-lts-jdk11
+        # env:
+        #   - name: JAVA_OPTS
+        #     value: "-Dhudson.cli.CLI.HTTPS=true -Djenkins.websocket=false"
+        imagePullPolicy: Always
+        livenessProbe:
+          failureThreshold: 12
+          httpGet:
+            path: /login
+            port: http
+            scheme: HTTP
+          initialDelaySeconds: 100
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 5
+        readinessProbe:
+          failureThreshold: 10
+          httpGet:
+            path: /login
+            port: http
+            scheme: HTTP
+          initialDelaySeconds: 80
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 1
+        resources:
+          limits:
+            cpu: 1500m
+            memory: 3Gi
+          requests:
+            cpu: 500m
+            memory: 500Mi
+    securityContext:
+      fsGroup: 1000
+      runAsUser: 1000
+  seedJobs:
+  - id: jenkins-operator
+    targets: ".jenkins/job/DslJob.jenkins" #"cicd/jobs/k8s.jenkins" 
+    description: "Casandra Repo"
+    repositoryBranch: infracloud/cassandra-5.0 #master #infracloud/cassandra-5.0 #
+    repositoryUrl: https://github.com/infracloudio/cassandra.git

.build/run-ci.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# Parse command-line arguments
+while [[ $# -gt 0 ]]; do
+    key="$1"
+    case $key in
+        -c|--kubeconfig)
+            KUBECONFIG="$2"  # This sets the KUBECONFIG variable to the next argument.
+            shift            # This shifts the arguments to the left, discarding the current argument and moving to the next one.
+            shift            # This is an additional shift to move to the argument after the option value.
+            ;;
+        -ctx|--kubecontext)
+            KUBECONTEXT="$2" # This sets the KUBECONTEXT variable to the next argument.
+            shift            # This shifts the arguments to the left, discarding the current argument and moving to the next one.
+            shift            # This is an additional shift to move to the argument after the option value.
+            ;;
+        *)
+            echo "Unknown option: $1"
+            exit 1
+            ;;
+    esac
+done
+
+if [ -z "$KUBECONFIG" ] && [ -z "$KUBECONTEXT" ]; then
+    echo "Please provide either the path to the kubeconfig using -c|--kubeconfig option or the kubecontext using -ctx|--kubecontext option."
+    exit 1
+fi
+
+# This sets the kubeconfig and kubecontext if provided
+if [ -n "$KUBECONFIG" ]; then
+    export KUBECONFIG="$KUBECONFIG"
+fi
+
+if [ -n "$KUBECONTEXT" ]; then
+    kubectl config use-context "$KUBECONTEXT"
+fi
+
+# Install Helm
+
+# Check if Helm is already installed
+if ! command -v helm &>/dev/null; then
+    echo "Helm not found. Installing Helm..."
+    curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 # enhance without downloading the script
+    chmod 700 get_helm.sh
+    ./get_helm.sh
+else
+    echo "Helm is already installed."
+fi
+
+# Add Helm Jenkins Operator repository
+echo "Adding Helm repository for Jenkins Operator..."
+helm repo add jenkins https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/chart
+
+# Install Jenkins Operator using Helm
+echo "Installing Jenkins Operator..."
+helm upgrade --install jenkins-operator jenkins/jenkins-operator --set jenkins.enabled=false --set jenkins.backup.enabled=false --version 0.8.0-beta.2 
+
+echo "Jenkins Operator installed successfully!" # condition to check if above command was success
+
+# deploy jenkins Instance TODO jenkins file parameter
+kubectl apply -f jenkins-deployment.yaml
+
+# TODO wait for job pods
+#kubectl rollout wait pod/ [--for=<condition>] 
+
+#sleep 120
+
+# get job pod name - TODO parametrise the job name
+#jobPodName=$(kubectl get po | grep k8sagent-e2e | cut -d " " -f1)
+
+# get the file - TODO parameterize the path to fetch path
+#kubectl exec -n default $jobPodName -- tar cf - /home/jenkins/agent/workspace/k8s-e2e | tar xf - -C .