re-enable test case, correct merge conflict

test/appframework_aws/c3/manager_appframework_test.go

@@ -304,7 +304,7 @@ var _ = Describe("c3appfw test", func() {
 		})
 	})
 
-	XContext("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework and Image Upgrade", func() {
+	Context("Single Site Indexer Cluster with Search Head Cluster (C3) and App Framework and Image Upgrade", func() {
 		It("smoke, c3, managerappframeworkc3t, appframework: can deploy a C3 SVA with App Framework enabled, install apps then upgrade the image and apps", func() {
 
 			//################## SETUP ####################

test/run-tests.sh

@@ -35,21 +35,6 @@ if [ -n "${PRIVATE_REGISTRY}" ]; then
   fi
 
   # Always attempt to pull splunk enterprise image
-<<<<<<< HEAD
-  echo "Pulling SPLUNK_ENTERPRISE_IMAGE=${SPLUNK_ENTERPRISE_IMAGE}..."
-  docker pull ${SPLUNK_ENTERPRISE_IMAGE}
-  if [ $? -ne 0 ]; then
-    echo "Unable to pull ${SPLUNK_ENTERPRISE_IMAGE}. Exiting..."
-    exit 1
-  fi
-
-  if [ "$ARM64" == "true" ]; then
-    echo "ARM64, enterprise tag and push unnecessary"
-  else
-    echo "Tagging to privat repo ${PRIVATE_SPLUNK_OPERATOR_IMAGE}..."
-    docker tag ${SPLUNK_ENTERPRISE_IMAGE} ${PRIVATE_SPLUNK_ENTERPRISE_IMAGE}
-    echo "Pushing to private repo ${PRIVATE_SPLUNK_ENTERPRISE_IMAGE}"
-=======
   echo "check if image exists, docker manifest inspect $PRIVATE_SPLUNK_ENTERPRISE_IMAGE"
   if docker manifest inspect "$PRIVATE_SPLUNK_ENTERPRISE_IMAGE" > /dev/null 2>&1; then
     echo "Image $PRIVATE_SPLUNK_ENTERPRISE_IMAGE exists on the remote repository."
@@ -66,7 +51,6 @@ if [ -n "${PRIVATE_REGISTRY}" ]; then
       exit 1
     fi
     docker tag ${SPLUNK_ENTERPRISE_IMAGE} ${PRIVATE_SPLUNK_ENTERPRISE_IMAGE}
->>>>>>> 7f9b7158 (Update 2.7.0 branch for gitlab testig needs.)
     docker push ${PRIVATE_SPLUNK_ENTERPRISE_IMAGE}
     if [ $? -ne 0 ]; then
       echo "Unable to push ${PRIVATE_SPLUNK_ENTERPRISE_IMAGE}. Exiting..."