diff --git a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh index ac4d54fc02cc88d00f7659bb97ec04f8e1a27947..9bae682429cec7cd5bcd0e17b88e55c7e7188e6f 100755 --- a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh +++ b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh @@ -9,6 +9,7 @@ passwd eric cat >> /etc/sudoers << EOFsudoers eric ALL=(ALL) NOPASSWD: ALL EOFsudoers +chmod a+rx ~eric sudo -u eric cp /vmBootstrap/gitScripts/.git-* ~eric/ cat /vmBootstrap/gitScripts/bash_profile.hook >> ~eric/.bash_profile sudo -u eric cp /vmBootstrap/tigConf/tigrc ~eric/.tigrc diff --git a/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/ctacli.sh b/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/ctacli.sh index e213aa3983671f374f743a616cc363d832b99bb5..0c4a74a2ac70b77618f98d5f9edf906aa20dadb4 100755 --- a/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/ctacli.sh +++ b/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/ctacli.sh @@ -1,5 +1,7 @@ #!/bin/bash +/opt/run/bin/init_pod.sh + cat <<EOF > /etc/cta/cta-cli.conf # The CTA frontend address in the form <FQDN>:<TCPPort> # solved by kubernetes DNS server so KIS... diff --git a/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/ctafrontend.sh b/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/ctafrontend.sh index 835ab806a061afb37eba36afd0a76f2c4293eb76..851a63d5c3330c715729e9a53ea54c455c06a464 100755 --- a/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/ctafrontend.sh +++ b/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/ctafrontend.sh @@ -1,5 +1,7 @@ #!/bin/sh +/opt/run/bin/init_pod.sh + yes | cp -r /opt/ci/ctafrontend/etc / /opt/run/bin/init_objectstore.sh diff --git a/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/init.sh b/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/init.sh index b3dfde0ae3b71e70e3ca37e8c7373d69706ebc7f..896cc0ef67b4a1c9b25b714d0e6f1a8478476838 100755 --- a/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/init.sh +++ b/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/init.sh @@ -1,5 +1,7 @@ #!/bin/sh +/opt/run/bin/init_pod.sh + echo "Using this configuration for library:" /opt/run/bin/init_library.sh cat /tmp/library-rc.sh diff --git a/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/init_pod.sh b/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/init_pod.sh index a42de022f7fd55188c843a34fb9e1ff095784c3a..10945c2da36c9d984edea04e4c26b00a7b6c1d36 100755 --- a/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/init_pod.sh +++ b/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/init_pod.sh @@ -8,3 +8,6 @@ echo "DONE" #echo -n "Yum should resolve names using IPv4 DNS: " #echo "ip_resolve=IPv4" >> /etc/yum.conf #echo "DONE" + +# Here we will symlink the builtree's contents to /usr/bin and /usr/lib64. +/opt/run/bin/mkSymlinks.sh diff --git a/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/rmcd.sh b/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/rmcd.sh index 8afe144d31e7136ee3a4ef57a274760c6e333814..e3e8b1847ed6ab2f4ae1f6c6d743b947c2a6dd85 100755 --- a/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/rmcd.sh +++ b/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/rmcd.sh @@ -9,6 +9,7 @@ cat /tmp/library-rc.sh . /tmp/library-rc.sh # to get rmcd logs to stdout +mkdir -p /var/log/castor mkfifo /var/log/castor/rmcd_legacy.log for ((;;)); do cat </var/log/castor/rmcd_legacy.log; done & disown diff --git a/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/taped.sh b/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/taped.sh index 27f5d67627717ee52124206c8c489b14454dc7cd..6bf1920b63d1f8aa1602777a1bc438bf9185fd08 100755 --- a/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/taped.sh +++ b/continuousintegration/docker/buildtree_runner/cc7/opt/run/bin/taped.sh @@ -70,7 +70,7 @@ tail -F /cta-taped.log & # working correctly echo BUILDTREE_BASE=${BUILDTREE_BASE} echo BUILDTREE_SUBDIR=${BUILDTREE_SUBDIR} -runuser -c "${BUILDTREE_BASE}/${BUILDTREE_SUBDIR}/tapeserver/cta-taped ${CTA_TAPED_OPTIONS}" +runuser -c "/usr/bin/cta-taped ${CTA_TAPED_OPTIONS}" echo "taped died" diff --git a/continuousintegration/docker/buildtree_runner/cc7/stage1-rpms/Dockerfile b/continuousintegration/docker/buildtree_runner/cc7/stage1-rpms/Dockerfile index 47fc2d7c5a0d90360a93f99104ee82d5d3ce8c13..32920011a8e329d0521e97fa597f09b2fc6087d8 100644 --- a/continuousintegration/docker/buildtree_runner/cc7/stage1-rpms/Dockerfile +++ b/continuousintegration/docker/buildtree_runner/cc7/stage1-rpms/Dockerfile @@ -55,6 +55,8 @@ RUN yum install -y \ # Populate local repository and enable it, then install any rpm that is needed for # any container. Finally add needed directories. RUN yum-config-manager --enable epel --setopt="epel.priority=4" \ + && \ + yum-config-manager --enable castor \ && \ yum install -y\ eos-client \ @@ -81,6 +83,7 @@ RUN yum-config-manager --enable epel --setopt="epel.priority=4" \ protobuf3 \ cryptopp \ json-c \ + castor-rmc-server \ && \ yum clean all \ && \ diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/taped.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/taped.sh index 49769a7f7e64ad2d1e9ec827a36b5c2842a2fda9..61e08a6d9b8729e14c0184948777e422ff24a1fc 100755 --- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/taped.sh +++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/taped.sh @@ -71,7 +71,7 @@ tail -F /cta-taped.log & # cta-taped is ran with runuser to avoid a bug with Docker that prevents both # the setresgid(-1, 1474, -1) and setresuid(-1, 14029, -1) system calls from # working correctly -runuser -c "/bin/cta-taped ${CTA_TAPED_OPTIONS}" +runuser -c "/usr/bin/cta-taped ${CTA_TAPED_OPTIONS}" echo "taped died" diff --git a/continuousintegration/orchestration/pod-ctacli.yaml b/continuousintegration/orchestration/pod-ctacli.yaml index b0d54509fdfd0b9435bfbaea8140ef8c221688c5..f0d313a7f95a294884ef05570333d8c994bdb138 100644 --- a/continuousintegration/orchestration/pod-ctacli.yaml +++ b/continuousintegration/orchestration/pod-ctacli.yaml @@ -21,6 +21,16 @@ spec: fieldPath: metadata.namespace - name: INSTANCE_NAME value: "$(MY_NAMESPACE)" + - name: BUILDTREE_BASE + valueFrom: + configMapKeyRef: + name: buildtree + key: base + - name: BUILDTREE_SUBDIR + valueFrom: + configMapKeyRef: + name: buildtree + key: subdir - name: TERM value: "xterm" command: ['/opt/run/bin/ctacli.sh'] diff --git a/continuousintegration/orchestration/pod-ctaeos.yaml b/continuousintegration/orchestration/pod-ctaeos.yaml index 3744bdebf3aa88b82777297466ebb68fbefb2293..f141172e82b165e1c436b4322b9de5e6937ead54 100644 --- a/continuousintegration/orchestration/pod-ctaeos.yaml +++ b/continuousintegration/orchestration/pod-ctaeos.yaml @@ -23,6 +23,16 @@ spec: value: "$(MY_NAMESPACE)" - name: frontend value: 'cta-frontend:10955' + - name: BUILDTREE_BASE + valueFrom: + configMapKeyRef: + name: buildtree + key: base + - name: BUILDTREE_SUBDIR + valueFrom: + configMapKeyRef: + name: buildtree + key: subdir - name: TERM value: "xterm" command: ['/opt/run/bin/ctaeos-mgm.sh'] diff --git a/continuousintegration/orchestration/pod-ctafrontend.yaml b/continuousintegration/orchestration/pod-ctafrontend.yaml index aedfcd3576616f2352ac097f58f11952699982b2..09acb3659bf38fa6faae2afec969c7934e23e174 100644 --- a/continuousintegration/orchestration/pod-ctafrontend.yaml +++ b/continuousintegration/orchestration/pod-ctafrontend.yaml @@ -21,6 +21,16 @@ spec: fieldPath: metadata.namespace - name: INSTANCE_NAME value: "$(MY_NAMESPACE)" + - name: BUILDTREE_BASE + valueFrom: + configMapKeyRef: + name: buildtree + key: base + - name: BUILDTREE_SUBDIR + valueFrom: + configMapKeyRef: + name: buildtree + key: subdir - name: TERM value: "xterm" command: ['/opt/run/bin/ctafrontend.sh'] diff --git a/continuousintegration/orchestration/pod-init.yaml b/continuousintegration/orchestration/pod-init.yaml index 36ff9ed56dbd73499ab2039f7cecc3f1a11ea1c3..3c8bce4b8c55b24f23ceb7312daa6db9dfe3902a 100644 --- a/continuousintegration/orchestration/pod-init.yaml +++ b/continuousintegration/orchestration/pod-init.yaml @@ -31,6 +31,16 @@ spec: configMapKeyRef: name: init key: keepobjectstore + - name: BUILDTREE_BASE + valueFrom: + configMapKeyRef: + name: buildtree + key: base + - name: BUILDTREE_SUBDIR + valueFrom: + configMapKeyRef: + name: buildtree + key: subdir command: ['/opt/run/bin/init.sh'] args: ["none"] volumeMounts: diff --git a/continuousintegration/orchestration/pod-tpsrv.yaml b/continuousintegration/orchestration/pod-tpsrv.yaml index 0380829fc7664feb8b38120456d2f5d53483f793..aa19be1c35a191a680b00d104d7345d9a8687d4e 100644 --- a/continuousintegration/orchestration/pod-tpsrv.yaml +++ b/continuousintegration/orchestration/pod-tpsrv.yaml @@ -21,6 +21,16 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: BUILDTREE_BASE + valueFrom: + configMapKeyRef: + name: buildtree + key: base + - name: BUILDTREE_SUBDIR + valueFrom: + configMapKeyRef: + name: buildtree + key: subdir - name: INSTANCE_NAME value: "$(MY_NAMESPACE)" - name: TERM