Update to TSM Client 8.1.7

This commit is contained in:
Deon George 2019-05-07 06:40:00 +10:00
parent 21e3ecd2cb
commit 7685f64dc1
2 changed files with 30 additions and 25 deletions

View File

@ -1,21 +1,19 @@
services:
- ${CI_REGISTRY}/leenooks/ci-docker:dind
stages: stages:
- build - build
- test - test
- docker - docker
# For some reason compiling on CentOS 6.x results in buffer corruption # For some reason compiling on CentOS 6.x results in buffer corruption
build:6-7.1: build:6-7.1:
stage: build stage: build
image: ${CI_REGISTRY}/leenooks/ci-tsm:6-7.1 image: ${CI_REGISTRY}/leenooks/ci-tsm:6-7.1
script: script:
- make -f Makefile.linux64 - make -f Makefile.linux64
only: only:
- c6 - c6
tags: tags:
- C - C
- x86_64
artifacts: artifacts:
name: "$CI_BUILD_NAME" name: "$CI_BUILD_NAME"
paths: paths:
@ -25,24 +23,26 @@ test:6-7.1:
stage: test stage: test
image: ${CI_REGISTRY}/leenooks/ci-tsm:6-7.1 image: ${CI_REGISTRY}/leenooks/ci-tsm:6-7.1
dependencies: dependencies:
- build:6-7.1 - build:6-7.1
script: script:
- cd test && ./test.sh - cd test && ./test.sh
only: only:
- c6 - c6
tags: tags:
- C - C
- x86_64
# Compile on CentOS 6.x, for some reason compiling on CentOS 7.x results in buffer corruption # Compile on CentOS 6.x, for some reason compiling on CentOS 7.x results in buffer corruption
build:7-8.1: build:7-8.1:
stage: build stage: build
image: ${CI_REGISTRY}/leenooks/ci-tsm:7-8.1 image: ${CI_REGISTRY}/leenooks/ci-tsm:7-8.1
script: script:
- make -f Makefile.linux64 - make -f Makefile.linux64
only: only:
- master - master
tags: tags:
- C - C
- x86_64
artifacts: artifacts:
name: "$CI_BUILD_NAME" name: "$CI_BUILD_NAME"
paths: paths:
@ -52,13 +52,14 @@ test:7-8.1:
stage: test stage: test
image: ${CI_REGISTRY}/leenooks/ci-tsm:7-8.1 image: ${CI_REGISTRY}/leenooks/ci-tsm:7-8.1
dependencies: dependencies:
- build:7-8.1 - build:7-8.1
script: script:
- cd test && ./test.sh - cd test && ./test.sh
only: only:
- master - master
tags: tags:
- C - C
- x86_64
artifacts: artifacts:
name: "$CI_BUILD_NAME" name: "$CI_BUILD_NAME"
paths: paths:
@ -67,16 +68,19 @@ test:7-8.1:
docker:7-8.1: docker:7-8.1:
stage: docker stage: docker
image: docker:latest image: docker:latest
services:
- docker:dind
before_script: before_script:
- docker info - docker info
- docker version - docker version
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
variables: variables:
CACHETAG: build CACHETAG: build
VERSION: 8.1.4 VERSION: 8.1.7
DOCKER_HOST: tcp://${CI_REGISTRY}-leenooks-ci-docker:2375 DOCKER_HOST: tcp://docker:2375
dependencies: dependencies:
- test:7-8.1 - test:7-8.1
script: script:
- if [ -f init ]; then chmod 500 init; fi - if [ -f init ]; then chmod 500 init; fi
- docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
@ -86,5 +90,6 @@ docker:7-8.1:
- docker push ${CI_REGISTRY_IMAGE}:${CACHETAG} - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
tags: tags:
- docker - docker
- x86_64
only: only:
- master - master

View File

@ -1,5 +1,5 @@
# NAME deon/tsmpipe # NAME deon/tsmpipe
# VERSION 8.1.4 # VERSION 8.1.7
FROM centos:7 FROM centos:7
@ -7,7 +7,7 @@ FROM centos:7
#RUN SOURCE_URL=ftp://public.dhe.ibm.com/storage/tivoli-storage-management/maintenance/client/v8r1/Linux/LinuxX86/BA/v812/8.1.2.0-TIV-TSMBAC-LinuxX86.tar \ #RUN SOURCE_URL=ftp://public.dhe.ibm.com/storage/tivoli-storage-management/maintenance/client/v8r1/Linux/LinuxX86/BA/v812/8.1.2.0-TIV-TSMBAC-LinuxX86.tar \
# If using PPA source # If using PPA source
RUN SOURCE_URL=http://yum.leenooks.net/docker/tsmba/8.1.4 \ RUN SOURCE_URL=http://yum.leenooks.vpn/docker/tsm/8.x/SP_CLIENT_8.1.7_LIN86_ML.tar.gz \
&& PREFIX=TSMCLI_LNX/tsmcli/linux86 \ && PREFIX=TSMCLI_LNX/tsmcli/linux86 \
&& CHARS=$(echo ${PREFIX} | awk -F"/" '{print NF}') \ && CHARS=$(echo ${PREFIX} | awk -F"/" '{print NF}') \
&& curl -SL ${SOURCE_URL} | tar -zC /tmp/ --strip-components ${CHARS} -xf - ${PREFIX}/gskcrypt64-*.linux.x86_64.rpm ${PREFIX}/gskssl64-*.linux.x86_64.rpm ${PREFIX}/TIVsm-API64.x86_64.rpm \ && curl -SL ${SOURCE_URL} | tar -zC /tmp/ --strip-components ${CHARS} -xf - ${PREFIX}/gskcrypt64-*.linux.x86_64.rpm ${PREFIX}/gskssl64-*.linux.x86_64.rpm ${PREFIX}/TIVsm-API64.x86_64.rpm \