Commit 07d0d50c authored by Julien Leduc's avatar Julien Leduc
Browse files

Merging further

added a /CANSTART file so that eos waits for all keys to be OK before starting.
/bin/sh -> /bin/bash to allow function names with `-`...
yum and yum-config-manager overridden when in BUILDTREE environment
ctafrontend not booting needs further work
parent 96e6b000
......@@ -33,6 +33,4 @@ ln -s -v -t /usr/bin \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/mediachanger/cta-mediachanger-mount \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/disk/xrdclfsopaquetest \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/xroot-client-test/xrootHammer
ln -s -v -t /usr/lib64 \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/xroot_plugins/libXrdCtaOfs.so
find ${BUILDTREE_BASE}/${BUILDTREE_SUBDIR} | grep '.so$' | xargs -itoto ln -s -v -t /usr/lib64 toto
......@@ -26,7 +26,7 @@ FROM gitlab-registry.cern.ch/linuxsupport/cc7-base
# my environment variables
ENV ORCHESTRATIONDIR="continuousintegration/orchestration/pods" \
LOCALORCHESTRATIONDIR="/opt/ci" \
BASEDIR="continuousintegration/docker/buildtree_runner/cc7" \
BASEDIR="continuousintegration/docker/ctafrontend/cc7" \
CTAREPODIR="/tmp/repo"
# Manage repos before running yum
......
......@@ -26,7 +26,7 @@ FROM buildtree-runner-stage1
# my environment variables
ENV ORCHESTRATIONDIR="continuousintegration/orchestration/pods" \
LOCALORCHESTRATIONDIR="/opt/ci" \
BASEDIR="continuousintegration/docker/buildtree_runner/cc7" \
BASEDIR="continuousintegration/docker/ctafrontend/cc7" \
CTAREPODIR="/tmp/repo"
# Add pod specific configuration
......
#!/bin/bash
/opt/run/bin/init_pod.sh
. /opt/run/bin/init_pod.sh
yum-config-manager --enable cta-artifacts
yum-config-manager --enable ceph
......
#!/bin/bash
/opt/run/bin/init_pod.sh
. /opt/run/bin/init_pod.sh
yum-config-manager --enable cta-artifacts
yum-config-manager --enable ceph
......
#!/bin/sh
#!/bin/bash
/opt/run/bin/init_pod.sh
. /opt/run/bin/init_pod.sh
yum-config-manager --enable cta-artifacts
yum-config-manager --enable eos-citrine-commit
......@@ -84,6 +84,16 @@ echo -n '0 u:daemon g:daemon n:ctaeos+ N:6361884315374059521 c:1481241620 e:0 f:
mkdir -p /fst
chown daemon:daemon /fst/
# Waiting for /CANSTART file before starting eos
echo -n "Waiting for /CANSTART before going further"
for ((i=0;i<600;i++)); do
test -f /CANSTART && break
sleep 1
echo -n .
done
test -f /CANSTART && echo OK || exit 1
# start and setup eos for xrdcp to the ${CTA_TEST_DIR}
#/etc/init.d/eos start
/usr/bin/xrootd -n mq -c /etc/xrd.cf.mq -l /var/log/eos/xrdlog.mq -b -Rdaemon
......
#!/bin/sh
#!/bin/bash
/opt/run/bin/init_pod.sh
. /opt/run/bin/init_pod.sh
yum-config-manager --enable cta-artifacts
yum-config-manager --enable ceph
......
#!/bin/sh
#!/bin/bash
/opt/run/bin/init_pod.sh
. /opt/run/bin/init_pod.sh
# enable cta repository from previously built artifacts
yum-config-manager --enable cta-artifacts
......
#!/bin/bash
# This file must be sourced from another shell script
# . /opt/run/bin/init_pod.sh
LOGMOUNT=/mnt/logs
......@@ -26,3 +27,11 @@ echo "DONE"
#echo -n "Yum should resolve names using IPv4 DNS: "
#echo "ip_resolve=IPv4" >> /etc/yum.conf
#echo "DONE"
# redefining yum commands if in BUILDTREE environment
if [[ -n ${BUILDTREE_BASE} ]]; then
echo "Configuring BUILDTREE environment"
yum-config-manager() { echo "Skipping yum-config-manager $@"; }
yum() { echo "Skipping yum $@"; }
/opt/run/bin/mkSymlinks.sh
fi
#!/bin/bash
/opt/run/bin/init_pod.sh
. /opt/run/bin/init_pod.sh
# Install missing RPMs (kdc)
yum -y install heimdal-server heimdal-workstation
......
#!/bin/bash
# make symbolic links to all CTA binaries.
# Following binary list is build from (run in the build tree):
# find -type f -executable | egrep -v "\.so$" | egrep -v "\.sh$" | grep -v RPM/BUILD | grep -v CMake | grep -v CPack
echo Creating symlinks for CTA binaries and symlinks.
ln -s -v -t /usr/bin \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/catalogue/cta-catalogue-admin-host-create \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/catalogue/cta-database-poll \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/catalogue/cta-catalogue-admin-user-create \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/catalogue/cta-catalogue-schema-create \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/catalogue/cta-catalogue-schema-drop \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/cmdline/cta \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/objectstore/dumpObject \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/objectstore/listObjectStore \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/objectstore/makeMinimalVFS \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/objectstore/cta-objectstore-dump-object \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/objectstore/cta-objectstore-list \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/objectstore/cta-objectstore-initialize \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/nameserver/makeMockNameServerBasePath \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/tapeserver/castor/tape/tapeserver/drive/TapeDriveReadWriteTest \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/tapeserver/castor/tape/tapeserver/daemon/cta-tapeserverd \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/tapeserver/cta-taped \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/tests/cta-systemTests \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/tests/cta-catalogueUnitTests \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/tests/cta-unitTests \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/tests/cta-unitTests-multiProcess \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/tests/cta-oraUnitTests \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/xroot_plugins/cta-xrootd_plugins-fakeeos \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/mediachanger/cta-mediachanger-dismount \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/mediachanger/cta-mediachanger-mount \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/disk/xrdclfsopaquetest \
${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/xroot-client-test/xrootHammer
find ${BUILDTREE_BASE}/${BUILDTREE_SUBDIR} | grep '.so$' | xargs -itoto ln -s -v -t /usr/lib64 toto
#!/bin/sh
#!/bin/bash
/opt/run/bin/init_pod.sh
. /opt/run/bin/init_pod.sh
yum-config-manager --enable cta-artifacts
yum-config-manager --enable ceph
......
#!/bin/sh
#!/bin/bash
/opt/run/bin/init_pod.sh
. /opt/run/bin/init_pod.sh
yum-config-manager --enable cta-artifacts
yum-config-manager --enable ceph
......
......@@ -240,6 +240,12 @@ kubectl --namespace=${instance} exec kdc cat /root/eos-server.keytab | kubectl -
kubectl --namespace=${instance} exec ctacli -- kinit -kt /root/ctaadmin1.keytab ctaadmin1@TEST.CTA
kubectl --namespace=${instance} exec client -- kinit -kt /root/user1.keytab user1@TEST.CTA
# allow eos to start
kubectl --namespace=${instance} exec ctaeos -- touch /CANSTART
# create users on the mgm
# this is done in ctaeos-mgm.sh as the mgm needs this to setup the ACLs
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment