more merge conflict resolution

Author: donoghuc

ci/docker_acceptance_tests.sh

@@ -16,18 +16,10 @@ if [ -n "$BUILD_JAVA_HOME" ]; then
 fi
 
 # Can run either a specific flavor, or all flavors -
-<<<<<<< HEAD
-# eg `ci/acceptance_tests.sh oss` will run tests for open source container
-#    `ci/acceptance_tests.sh full` will run tests for the default container
-#    `ci/acceptance_tests.sh ubi8` will run tests for the ubi8 based container
-#    `ci/acceptance_tests.sh wolfi` will run tests for the wolfi based container
-#    `ci/acceptance_tests.sh` will run tests for all containers
-=======
 # eg `ci/docker_acceptance_tests.sh oss` will run tests for open source container
 #    `ci/docker_acceptance_tests.sh full` will run tests for the default container
 #    `ci/docker_acceptance_tests.sh wolfi` will run tests for the wolfi based container
 #    `ci/docker_acceptance_tests.sh` will run tests for all containers
->>>>>>> 205d8ab78 (Consistent bundled jruby across all CI tasks (#18615))
 SELECTED_TEST_SUITE=$1
 
 # The acceptance test in our CI infrastructure doesn't clear the workspace between run
@@ -41,30 +33,8 @@ if [[ $SELECTED_TEST_SUITE == "oss" ]]; then
   echo "--- Building and testing $SELECTED_TEST_SUITE docker images"
   ./gradlew runDockerOssTests
 elif [[ $SELECTED_TEST_SUITE == "full" ]]; then
-<<<<<<< HEAD
-  echo "--- Building $SELECTED_TEST_SUITE docker images"
-  cd $LS_HOME
-  ./gradlew artifactDocker
-  echo "--- Acceptance: Installing dependencies"
-  cd $QA_DIR
-  bundle install
-
-  echo "--- Acceptance: Running the tests"
-  bundle exec rspec docker/spec/full/*_spec.rb
-elif [[ $SELECTED_TEST_SUITE == "ubi8" ]]; then
-  echo "--- Building $SELECTED_TEST_SUITE docker images"
-  cd $LS_HOME
-  ./gradlew artifactDockerUbi8
-  echo "--- Acceptance: Installing dependencies"
-  cd $QA_DIR
-  bundle install
-
-  echo "--- Acceptance: Running the tests"
-  bundle exec rspec docker/spec/ubi8/*_spec.rb
-=======
   echo "--- Building and testing $SELECTED_TEST_SUITE docker images"
   ./gradlew runDockerFullTests
->>>>>>> 205d8ab78 (Consistent bundled jruby across all CI tasks (#18615))
 elif [[ $SELECTED_TEST_SUITE == "wolfi" ]]; then
   echo "--- Building and testing $SELECTED_TEST_SUITE docker images"
   ./gradlew runDockerWolfiTests