Copied gitlab-ci.yml file from master

.gitlab-ci.yml

@@ -12,7 +12,7 @@ fork_packages_el6:
   stage: build
   image: maikenp/arc-build-centos6
   script:
-    - echo "${CI_COMMIT_SHA:0:8}_$(date +%Y%m%dT%H%M%S)_master" > VERSION
+    - echo "$(date +%Y%m%dT%H%M%S)_${CI_COMMIT_SHA:0:8}_master" > VERSION
     - yum update -y
     - ./autogen.sh
     - ./configure
@@ -24,7 +24,7 @@ fork_packages_el6:
     - mv nordugrid-arc-${VERSION}.tar.gz rpmbuild/SOURCES
     - rpmbuild -D "_topdir $CI_PROJECT_DIR/rpmbuild" -ba nordugrid-arc.spec
   tags:
-    - build-el6
+    - build-el7
   except:
     refs:
       - master
@@ -46,7 +46,7 @@ fork_packages_el7:
   stage: build
   image: maikenp/arc-build-centos7
   script:
-    - echo "${CI_COMMIT_SHA:0:8}_$(date +%Y%m%dT%H%M%S)_master" > VERSION
+    - echo "$(date +%Y%m%dT%H%M%S)_${CI_COMMIT_SHA:0:8}_master" > VERSION
     - yum update -y
     - ./autogen.sh
     - ./configure
@@ -80,7 +80,6 @@ fork_packages_deb9:
   stage: build
   image: maikenp/arc-build-debian9
   script:
-    - echo "${CI_COMMIT_SHA:0:8}_$(date +%Y%m%dT%H%M%S)_master" > VERSION
     - apt-get update -y
     - echo "6.0.0" > VERSION
     - ./autogen.sh
@@ -118,7 +117,7 @@ packages_deb9:
   stage: packages
   image: maikenp/arc-build-debian9
   script:
-    - echo "${CI_COMMIT_SHA:0:8}_$(date +%Y%m%dT%H%M%S)_master" > VERSION
+    - echo "6.0.0" > VERSION
     - apt-get update -y
     - ./autogen.sh
     - ./configure
@@ -153,7 +152,7 @@ packages_el6:
   stage: packages
   image: maikenp/arc-build-centos6
   script:
-    - echo "${CI_COMMIT_SHA:0:8}_$(date +%Y%m%dT%H%M%S)_master" > VERSION
+    - echo "$(date +%Y%m%dT%H%M%S)_${CI_COMMIT_SHA:0:8}_master" > VERSION
     - yum update -y
     - ./autogen.sh
     - ./configure
@@ -184,7 +183,7 @@ packages_el7:
   stage: packages
   image: maikenp/arc-build-centos7
   script:
-    - echo "${CI_COMMIT_SHA:0:8}_$(date +%Y%m%dT%H%M%S)_master" > VERSION	
+    - echo "$(date +%Y%m%dT%H%M%S)_${CI_COMMIT_SHA:0:8}_master" > VERSION
     - yum update -y
     - ./autogen.sh
     - ./configure
@@ -215,14 +214,21 @@ deploy_staging_el6:
   stage: deploy_and_test
   image: docker:stable
   script:
+    - cat /dockerrun.sh
+    - ls -lhrt /arc-testfiles
+    - ls -lhrt /arc-logs
     - source /dockerrun.sh
+    - echo "*************>>  Done - back from inner container"
+    - ls -lhrt /arc-logs
+    - cp -r /arc-logs $CI_PROJECT_DIR
+    - ls -lhrt $CI_PROJECT_DIR/arc-logs
   environment:
     name: staging
   artifacts:
     when: always
     paths:
-     - /arc/arc-logs/
-     - /arc/arc-tests/
+     - $CI_PROJECT_DIR/arc-logs/
+     #- $CI_PROJECT_DIR/arc-tests/
   dependencies:
     - packages_el6
   tags:
@@ -237,14 +243,21 @@ deploy_staging_el7:
   stage: deploy_and_test
   image: docker:stable
   script:
+    - cat /dockerrun.sh
+    - ls -lhrt /arc-testfiles
+    - ls -lhrt /arc-logs
     - source /dockerrun.sh
+    - echo "*************>>  Done - back from inner container"
+    - ls -lhrt /arc-logs
+    - cp -r /arc-logs $CI_PROJECT_DIR
+    - ls -lhrt $CI_PROJECT_DIR/arc-logs
   environment:
     name: staging
   artifacts:
     when: always
     paths:
-     - /arc/arc-logs/
-     - /arc/arc-tests/
+     - $CI_PROJECT_DIR/arc-logs/
+     #- $CI_PROJECT_DIR/arc-tests/
   dependencies:
     - packages_el7
   tags: