SDCH-3421: Cleanup code

.gitlab-ci.yml

@@ -239,8 +239,6 @@ build_lofar_pulp_docker_image:
     - docker push $CI_NEXUS_REGISTRY_LOCATION/ci_lofar_pulp:$CI_COMMIT_SHORT_SHA
     - docker logout $CI_NEXUS_REGISTRY
   interruptible: true
-  needs:
-    - prepare_ci_base_docker_image
   when: manual # pulp docker images take a long time to build. It does not/hardly depend on currently developed lofar code. So an automatic build for each lofar commit is not needed.
 
 build_Docker:

Docker/lofar-pulp/Dockerfile

@@ -29,9 +29,9 @@ RUN apt-get update && apt-get install -y sasl2-bin libuuid1 libnss3 libnspr4 xqi
 # QPID daemon legacy store would require: libaio-dev libdb5.1++-dev
 RUN apt-get update && apt-get install -y ruby ruby-dev libsasl2-dev uuid-dev libxerces-c-dev libnss3-dev libnspr4-dev help2man libsslcommon2-dev libxqilla-dev libboost-program-options${BOOST_VERSION}-dev libboost-filesystem${BOOST_VERSION}-dev && \
     mkdir -p /opt/qpid/src && \
-    git clone --depth=1 -b SDCH-3421 https://git.astron.nl/ro/lofar.git /opt/qpid/src && \
+    git clone --depth=1 https://git.astron.nl/ro/lofar.git /opt/qpid/src && \
     cd /opt/qpid/src/LCS/MessageBus/qpid && \
-    bash -c "HOME=/tmp /opt/qpid/src/LCS/MessageBus/qpid/local/sbin/build_qpid"  && \
+    bash -c "HOME=/tmp /opt/qpid/src/LCS/MessageBus/qpid/local/sbin/build_qpid" && \
     bash -c "strip /opt/qpid/{bin,lib}/* || true" && \
     bash -c "rm -rf /tmp/sources /opt/qpid/src" && \
     apt-get purge -y ruby ruby-dev libsasl2-dev uuid-dev libxerces-c-dev libnss3-dev libnspr4-dev help2man libsslcommon2-dev libxqilla-dev libboost-program-options${BOOST_VERSION}-dev libboost-filesystem${BOOST_VERSION}-dev && \