Merge branch 'version-manage' into 'master'

合并 docker image 和 rpm 到master

See merge request tsg/tsg-diagnose!1

.gitlab-ci.yml

@@ -0,0 +1,83 @@
+stages:
+- build
+
+.build_docker_images:
+  image: docker:stable
+  before_script:
+    - docker info
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+  only:
+    - tags
+  tags:
+    - share
+    
+.build_rpm:
+  image: "git.mesalab.cn:7443/mesa_platform/build-env:master"
+  variables:
+    GIT_STRATEGY: "clone"
+    BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
+    TESTING_VERSION_BUILD: 0
+  before_script:
+    - mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/
+    - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
+    - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
+    - chmod +x ./ci/travis.sh
+  script:
+    - yum makecache
+    - ./ci/travis.sh
+  tags:
+  - share
+
+unittest_build:
+  stage: build
+  extends: .build_docker_images
+  variables:
+    UNITTEST_IMAGE_TAG: $CI_REGISTRY_IMAGE/unittest:$CI_COMMIT_TAG-$CI_COMMIT_SHA
+    UNITTEST_IMAGE_LATEST_TAG: $CI_REGISTRY_IMAGE/unittest:latest
+  script:
+    - docker build -t $UNITTEST_IMAGE_TAG -f ./unittest_python/Dockerfile ./unittest_python/
+    - docker tag $UNITTEST_IMAGE_TAG $UNITTEST_IMAGE_LATEST_TAG
+    - docker push $UNITTEST_IMAGE_TAG 
+    - docker push $UNITTEST_IMAGE_LATEST_TAG
+
+
+wpr_build:
+  stage: build
+  extends: .build_docker_images
+  variables:
+    WPR_IMAGE_TAG: $CI_REGISTRY_IMAGE/wpr:$CI_COMMIT_TAG-$CI_COMMIT_SHA
+    WPR_IMAGE_LATEST_TAG: $CI_REGISTRY_IMAGE/wpr:latest
+  script:
+    - docker build -t $WPR_IMAGE_TAG -f ./wpr_golang/Dockerfile ./wpr_golang/
+    - docker tag $WPR_IMAGE_TAG $WPR_IMAGE_LATEST_TAG
+    - docker push $WPR_IMAGE_TAG 
+    - docker push $WPR_IMAGE_LATEST_TAG
+
+
+badssl_build:
+  stage: build
+  extends: .build_docker_images
+  variables:
+    BADSSL_IMAGE_TAG: $CI_REGISTRY_IMAGE/badssl:$CI_COMMIT_TAG-$CI_COMMIT_SHA
+    BADSSL_IMAGE_LATEST_TAG: $CI_REGISTRY_IMAGE/badssl:latest
+  script:
+    - docker build -t $BADSSL_IMAGE_TAG -f ./badssl.com/Dockerfile ./badssl.com/
+    - docker tag $BADSSL_IMAGE_TAG $BADSSL_IMAGE_LATEST_TAG
+    - docker push $BADSSL_IMAGE_TAG
+    - docker push $BADSSL_IMAGE_LATEST_TAG
+    
+rpm_build:
+  stage: build
+  variables:
+    PACKAGE: 1
+    UPLOAD: 1
+    PULP3_REPO_NAME: tsg-stable-x86_64.el7
+    PULP3_DIST_NAME: tsg-stable-x86_64.el7
+  extends: .build_rpm
+  artifacts:
+    name: "self-test-install-$CI_COMMIT_REF_NAME-release"
+    paths:
+      - build/*.rpm
+  only:
+    - tags
+

CMakeLists.txt

@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.5)
+project(self-test)
+
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+include(Version)
+include(Package)

badssl.com/Dockerfile

@@ -1,7 +1,6 @@
 # Start with Ubuntu 16.04 (LTS), and build badssl.com up from there
 FROM ubuntu:16.04
 MAINTAINER April King <april@pokeinthe.io>
-EXPOSE 80 443
 
 RUN sed -i s@/archive.ubuntu.com/@/mirrors.163.com/@g /etc/apt/sources.list \
     && apt-get clean \
@@ -26,7 +25,6 @@ RUN sed -i s@/archive.ubuntu.com/@/mirrors.163.com/@g /etc/apt/sources.list \
 # Install badssl.com
 ADD . badssl.com
 WORKDIR badssl.com
-RUN make inside-docker
 
 # Start things up!
 CMD tail -f /dev/null

ci/get-nprocessors.sh

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+# Copyright 2017 Google Inc.
+# All Rights Reserved.
+#
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# This file is typically sourced by another script.
+# if possible, ask for the precise number of processors,
+# otherwise take 2 processors as reasonable default; see
+# https://docs.travis-ci.com/user/speeding-up-the-build/#Makefile-optimization
+if [ -x /usr/bin/getconf ]; then
+    NPROCESSORS=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+else
+    NPROCESSORS=2
+fi
+
+# as of 2017-09-04 Travis CI reports 32 processors, but GCC build
+# crashes if parallelized too much (maybe memory consumption problem),
+# so limit to 4 processors for the time being.
+if [ $NPROCESSORS -gt 4 ] ; then
+	echo "$0:Note: Limiting processors to use by make from $NPROCESSORS to 4."
+	NPROCESSORS=4
+fi

ci/perpare_pulp3_netrc.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+set -evx
+echo "machine ${PULP3_SERVER_URL}\nlogin ${PULP3_SERVER_LOGIN}\npassword ${PULP3_SERVER_PASSWORD}\n" > ~/.netrc

ci/travis.sh

@@ -0,0 +1,50 @@
+#!/usr/bin/env sh
+echo $CPLUS_INCLUDE_PATH
+set -evx
+
+chmod +x ci/get-nprocessors.sh
+. ci/get-nprocessors.sh
+
+# if possible, ask for the precise number of processors,
+# otherwise take 2 processors as reasonable default; see
+# https://docs.travis-ci.com/user/speeding-up-the-build/#Makefile-optimization
+if [ -x /usr/bin/getconf ]; then
+    NPROCESSORS=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+else
+    NPROCESSORS=2
+fi
+
+# as of 2017-09-04 Travis CI reports 32 processors, but GCC build
+# crashes if parallelized too much (maybe memory consumption problem),
+# so limit to 4 processors for the time being.
+if [ $NPROCESSORS -gt 4 ] ; then
+	echo "$0:Note: Limiting processors to use by make from $NPROCESSORS to 4."
+	NPROCESSORS=4
+fi
+
+# Tell make to use the processors. No preceding '-' required.
+MAKEFLAGS="j${NPROCESSORS}"
+export MAKEFLAGS
+
+env | sort
+
+# Set default values to OFF for these variables if not specified.
+: "${NO_EXCEPTION:=OFF}"
+: "${NO_RTTI:=OFF}"
+: "${COMPILER_IS_GNUCXX:=OFF}"
+
+mkdir build || true
+cd build
+
+cmake3 ..
+
+if [ -n "${PACKAGE}" ]; then
+	make package
+fi
+
+if [ -n "${UPLOAD}" ]; then	
+	cp ~/rpm_upload_tools.py ./
+	python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm
+fi
+
+

cmake/Package.cmake

@@ -0,0 +1,25 @@
+set(CPACK_PACKAGE_NAME "self-test")
+
+message(STATUS "Package: ${CPACK_PACKAGE_NAME}")
+
+set(CPACK_PACKAGE_VENDOR "TSG")
+set(CPACK_PACKAGE_VERSION_MAJOR "${SELF_TEST_VERSION_MAJOR}")
+set(CPACK_PACKAGE_VERSION_MINOR "${SELF_TEST_VERSION_MINOR}")
+set(CPACK_PACKAGE_VERSION_PATCH "${SELF_TEST_VERSION_PATCH}.${SELF_TEST_DESCRIBE}")
+set(CMAKE_INSTALL_PREFIX "/opt/tsg/self_test")
+set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+
+# RPM Build
+set(CPACK_GENERATOR "RPM")
+set(CPACK_RPM_AUTO_GENERATED_FILE_NAME ON)
+set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
+set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
+set(CPACK_RPM_PACKAGE_RELEASE_DIST on)
+set(CPACK_RPM_DEBUGINFO_PACKAGE on)
+
+set(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreInstall.in)
+
+install(FILES docker-compose/docker-compose.yml DESTINATION ./compose)
+install(FILES docker-compose/self-test.service DESTINATION /usr/lib/systemd/system)
+
+include(CPack)

cmake/PreInstall.in

@@ -0,0 +1 @@
+systemctl stop self-test

cmake/Version.cmake

@@ -0,0 +1,42 @@
+
+# Using autorevision.sh to generate version information
+
+set(__SOURCE_AUTORESIVISION ${CMAKE_SOURCE_DIR}/autorevision.sh)
+set(__AUTORESIVISION ${CMAKE_BINARY_DIR}/autorevision.sh)
+set(__VERSION_CACHE ${CMAKE_SOURCE_DIR}/version.txt)
+set(__VERSION_CONFIG ${CMAKE_BINARY_DIR}/version.cmake)
+
+file(COPY ${__SOURCE_AUTORESIVISION} DESTINATION ${CMAKE_BINARY_DIR}
+	FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+	WORLD_READ WORLD_EXECUTE)
+
+# execute autorevision.sh to generate version information
+execute_process(COMMAND ${__AUTORESIVISION} -t cmake -o ${__VERSION_CACHE} OUTPUT_FILE ${__VERSION_CONFIG})
+include(${__VERSION_CONFIG})
+
+# extract major, minor, patch version from git tag
+string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" SELF_TEST_VERSION_MAJOR "${VCS_TAG}")
+string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" SELF_TEST_VERSION_MINOR "${VCS_TAG}")
+string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" SELF_TEST_VERSION_PATCH "${VCS_TAG}")
+
+if(NOT SELF_TEST_VERSION_MAJOR)
+	set(SELF_TEST_VERSION_MAJOR 3)
+endif()
+
+if(NOT SELF_TEST_VERSION_MINOR)
+	set(SELF_TEST_VERSION_MINOR 0)
+endif()
+
+if(NOT SELF_TEST_VERSION_PATCH)
+	set(SELF_TEST_VERSION_PATCH 0)
+endif()
+
+set(SELF_TEST_VERSION "${SELF_TEST_VERSION_MAJOR}.${SELF_TEST_VERSION_MINOR}.${SELF_TEST_VERSION_PATCH}")
+set(SELF_TEST_DESCRIBE "${VCS_SHORT_HASH}")
+set(SELF_TEST_GIT_VERSION "${SELF_TEST_VERSION_MAJOR}.${SELF_TEST_VERSION_MINOR}.${SELF_TEST_VERSION_PATCH}-${SELF_TEST_DESCRIBE}")
+set(SELF_TEST_VAR_VERSION "${SELF_TEST_VERSION_MAJOR}_${SELF_TEST_VERSION_MINOR}_${SELF_TEST_VERSION_PATCH}_${SELF_TEST_DESCRIBE}")
+
+# print information
+message(STATUS "Welcome to SELF_TEST, Version: ${SELF_TEST_GIT_VERSION}")
+add_definitions(-DSELF_TEST_GIT_VERSION=\"${SELF_TEST_GIT_VERSION}\")
+add_definitions(-DSELF_TEST_VAR_VERSION=${SELF_TEST_VAR_VERSION})

docker-compose/docker-compose.yml

@@ -3,7 +3,7 @@ version: '2.2'
 services:
 
   badssl_test:
-    image: "badssl:ssl-self-test"
+    image: "badssl-self-test:latest"
     container_name: "badssl_ssl_self_test"
     tty: true
     privileged: true
@@ -19,7 +19,6 @@ services:
     command: >
       bash -c "ifconfig eth0 hw ether 02:42:c0:a8:fd:82
       && arp -i eth0 -s 192.0.2.3 02:42:C0:A8:FD:03 
-      && make clean-certs 
       && make certs-test
       && make inside-docker 
       && cp -r /badssl.com/certs /badssl.com/unittest_certs
@@ -27,7 +26,7 @@ services:
       && tail -f /dev/null"
 
   wpr_test:
-    image: "golang:wpr-alpine"
+    image: "wpr-self-test:latest"
     container_name: "wpr_ssl_self_test"
     tty: true
     privileged: true
@@ -50,7 +49,7 @@ services:
         tail -f /dev/null
         
   ssl_unittest:
-    image: "python:unittest-alpine"
+    image: "unittest-self-test:latest"
     container_name: "unittest_ssl_self_test"
     depends_on: 
       - badssl_test

docker-compose/self-test.service

@@ -0,0 +1,15 @@
+[Unit]
+Description=Tsg self test
+Requires=docker.service
+After=docker.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/bin/true
+ExecStop=/bin/true
+ExecStartPost=/usr/local/bin/docker-compose -f /opt/tsg/self_test/compose/docker-compose.yml up -d
+ExecStopPost=/usr/local/bin/docker-compose -f /opt/tsg/self_test/compose/docker-compose.yml down
+
+[Install]
+WantedBy=multi-user.target