Commit Graph

282 Commits

Author SHA1 Message Date
Steve Smith
302c23d2b1 DCD-1271: Re-add package upgrades and add corresponding linting override. 2021-04-15 16:37:47 +10:00
Steve Smith
c8a86e38a3 DCD-1271: Disable quoting suggestion. 2021-04-15 11:46:36 +10:00
Steve Smith
5f32f41de3 DCD-1271: Add hadolint configuration 2021-04-15 11:40:08 +10:00
Steve Smith
273d11c686 Merged in docker-best-practices (pull request #89)
Docker best practices

Approved-by: Adam Brokes
2021-04-15 01:27:08 +00:00
Steve Smith
f87454bdc2 Merged in DCD-1273-remove-renovate (pull request #90)
DCD-1273: Remove renovate as superseded by snyk.

Approved-by: Adam Brokes
2021-04-14 22:05:40 +00:00
Steve Smith
12430be310 DCD-1273: Remove renovate as superseded by snyk. 2021-04-14 17:15:58 +10:00
Steve Smith
085f0e9e1b DCD-1272: Add security/maintainer metadata to alpine. 2021-04-14 17:15:01 +10:00
Steve Smith
69ba4f41d1 DCD-1270: Remove package upgrade from the build process. 2021-04-14 17:15:01 +10:00
Steve Smith
31d9f84201 DCD-1272: Add security/maintainer metadata. 2021-04-14 17:15:01 +10:00
Steve Smith
b8df54a5cb Merged in fix-integration-test (pull request #91)
Reference new integration test script.

Approved-by: Adam Brokes
2021-04-14 06:08:11 +00:00
Steve Smith
1a6138ca16 Add more output to the test runs. 2021-04-14 15:53:55 +10:00
Steve Smith
d9274112f3 Add names to unit/func test steps. 2021-04-14 15:48:19 +10:00
Steve Smith
38f13cdcb6 Confluence 7.12.0 seems to have changed the support-args processing breaking a test, so removed. 2021-04-14 15:45:33 +10:00
Steve Smith
26795d2215 Reference new integration test script. 2021-04-14 12:28:44 +10:00
Steve Smith
27abb5339c Merged in DCD-1253-remove-server-refs-from-readme (pull request #88)
DCD-1253: Remove "-server" references from the readme.

Approved-by: Adam Brokes
2021-04-01 04:40:14 +00:00
Steve Smith
893edff6f3 DCD-1253: Clarify deprecation. 2021-03-31 15:45:31 +11:00
Steve Smith
48497b7960 DCD-1253: Remove "-server" references from the readme. 2021-03-31 15:21:07 +11:00
Steve Smith
4832c3bce5 Merged in DCD-1253-fix-tagging (pull request #87)
DCD-1253: Fix tags getting lost.

Approved-by: Adam Brokes
2021-03-29 21:11:47 +00:00
Steve Smith
e619e36f30 DCD-1253: Fix tags getting lost. 2021-03-29 17:21:24 +11:00
Steve Smith
ebb81ad5fb Merged in DCD-1253-fix-alpine (pull request #86)
DCD-1253: Fix typo and missing flag for the target dockerfile.

Approved-by: Geoff Jacobs
Approved-by: Nasser Ghazali-Beiklar
2021-03-29 04:49:42 +00:00
Steve Smith
e1582a4ed3 DCD-1253: Fix typo and missing flag for the target dockerfile. 2021-03-29 15:29:57 +11:00
Steve Smith
c00cd6c978 Merged in DCD-1253-use-native-multirepo-builder (pull request #85)
DCD-1253: Convert to the newer CLI-based builder with multi-repo support.

Approved-by: Adam Brokes
2021-03-29 04:15:54 +00:00
Steve Smith
f96210081b DCD-1253: Pipelines yaml seems to handle multiline differently when in a list. 2021-03-29 14:25:28 +11:00
Steve Smith
b9a3bb2ad4 DCD-1253: We need the full-path for the release maker. 2021-03-29 12:10:58 +11:00
Steve Smith
e4d5e58289 DCD-1253: Fix path. 2021-03-24 09:28:34 +11:00
Steve Smith
2308c6e5ab DCD-1253: Add pipelines generator template and convert to the newer CLI-based builder with multi-repo support. 2021-03-23 15:43:13 +11:00
Joy Chiu
b32ae60c1d Merged in DCD-1234/remove-schedule (pull request #84)
Use default schedule

Approved-by: Steve Smith
2021-03-17 04:14:45 +00:00
Joy Chiu
7b206d6547 Use default schedule 2021-03-17 03:47:00 +00:00
psre-renovate-bot
90c844e45f Merged in renovate/configure (pull request #82)
Configure Renovate

Approved-by: Steve Smith
2021-03-15 00:46:52 +00:00
Nasser Ghazali-Beiklar
2a28ea5182 Merged in DCKUBE-136-RunSmoketestsInReleasePipeline (pull request #83)
DCKUBE-135, DCKUBE-136, DCKUBE_137, and DCKUBE-138: Add Smoke tests in Confluence Pipeline
This PR contains code change for three tickets which are related and should merge to master together.

KUBEDCKUBE-135:
Applied security scan to bitbucket pipeline for branch builds in confluence - for releases, the test script will run by run.py for releases and for branch builds and custom releases will directly runs snyk scanner
Created a smoke testing suite via REST and included these scenarios: Create a space, Create a page, Search for the page, View page, Add attachments, Delete the page, and Delete the space

KUBEDCKUBE-136:
Added a separated docker for confluence to based on the docker image to copy confluence home directory
Injected target confluence image to Dockerfile
set the number of concurrent builds to one in pipeline
clean docker-compose before start and force to recreate the containers
Modified the script in order to install netcat-openbsd using apkfor Alpine (apt-getis not available in Alpine)
Replaced colfuence-home directory and postgres scripts with confluence 6.0.1 compatible to avoid downgrade version in release images
Increased database connection numbers to 125
Addressed some review points, replaced the confluence home directory and sql with version 6.0.1
Addressed a review points, renamed CONFLUENCE_USER to CONFLUENCE_ADMIN
divided pipeline into batches to avoid pipeline timeout

KUBEDCKUBE-137:
Run smoketests in branch builds after each commit
Completed smoketests and also addressed some review points

KUBEDCKUBE-138:
Added development document

Approved-by: Adam Brokes
2021-03-12 03:30:51 +00:00
Joy Chiu
4cc2aa93df DCD-1234: adding file to turn on automatic security vuln ticket filing 2021-03-09 22:52:59 +00:00
Joy Chiu
c0f29b05ee Run every Monday 2021-03-09 22:40:13 +00:00
Renovate Bot
350d93ab2a Add renovate.json 2021-03-09 09:50:38 +00:00
Ben Partridge
42592fab7e Merged in DCD-1238-fix-oracle-database-type (pull request #80)
DCD-1238: Add database type mapping for oracle which supports oracle 12c and 19c in Confluence 7.3.1+

Approved-by: Steve Smith
Approved-by: Nasser Ghazali-Beiklar
2021-03-05 05:29:10 +00:00
Ben Partridge
eabad37f4f DCD-1238: Update README with ATL_DB_TYPE value for oracle for Confluence 7.3.1 and later 2021-03-05 11:01:03 +11:00
Ben Partridge
78fa23866f DCD-1238: Add database type mapping for oracle which supports oracle 12c and 19c in Confluence 7.3.1+ 2021-03-05 10:53:21 +11:00
Nasser Ghazali-Beiklar
5654d4c095 Merged in DCKUBE-111-security-scan (pull request #78)
DCKUBE-111 security scan

* DCKUBE-111 - Applied security scan to bitbucket pipeline - passed the test script to run.py and also directly ran snyk scanner on custom releases

* DCKUBE-111 - as script test has a default then no need to pass it as a parameter

* DCKUBE-111 - removed snyk auth

* DCKUBE-111 - Added snyk authentication before scan

* DCKUBE-111 - Fixed typo in image names

* DCKUBE-111 - Set environment variable as part of applying the review point on docker release maker to changed push_image and test to env var instead of parameters to run.py

* DCKUBE-111 - removed PUSH_IMAGE and INTEGRATION_TEST_SCRIPT from pipeline yaml file because are default values and are not needed to override with the same value

Approved-by: Adam Brokes
2021-02-17 06:44:12 +00:00
Adam Brokes
f7955bc991 Merged in DCD-1148-default-to-log-file (pull request #76)
DCD-1148: Default application logs back to the log files (instead of stdout)

Approved-by: Steve Smith
2020-11-24 07:03:45 +00:00
Adam Brokes
37f36e85de
DCD-1148: Default application logs back to the log files (instead of stdout) 2020-11-24 09:45:18 +11:00
Adam Brokes
9e2de19c41 Merged in DCD-1119-disable-file-log (pull request #75)
DCD-1119: Stop sending application logs to file

* DCD-1119: Stop sending application logs to file

* DCD-1119: Add variable and document it

Approved-by: Kenny MacLeod
Approved-by: Dave Chevell
2020-11-11 22:30:32 +00:00
Kenny MacLeod
1045386ac9 Merged in issue/SCALE-33 (pull request #73)
SCALE-33 ATL_LICENSE_KEY will only work from conf 7.9+

Approved-by: Dave Chevell
Approved-by: Minh Tran
2020-11-03 09:06:57 +00:00
Dave Chevell
e67ef33cec Merged in native-tini (pull request #74)
Install tini via package manager

Approved-by: Steve Smith
2020-10-19 00:52:49 +00:00
Dave Chevell
6e46fb8705 Install tini via package manager 2020-10-19 08:44:06 +11:00
Kenny MacLeod
386f3aa00b
SCALE-33 ATL_LICENSE_KEY will only work from conf 7.9+ 2020-09-22 16:59:03 +01:00
Ben Partridge
7558c08b87 Merged in no-issue-remove-eap-latest-tag-docs (pull request #72)
Update documentation and remove untrue statement about building eap tag for newest EAP

Approved-by: Dave Chevell
2020-09-21 07:24:56 +00:00
Ben Partridge
6dcad651f7
Update documentation and remove untrue statement about building eap tag for newest EAP 2020-09-21 16:59:04 +10:00
Kenny MacLeod
e6f61fd2aa Merged in issue/SCALE-33 (pull request #71)
SCALE-33 Allow injection of license key via env var

Approved-by: Steve Smith
Approved-by: Dave Chevell
2020-09-11 09:03:34 +00:00
Kenny MacLeod
f2bd04b277
SCALE-33 Document new env var in README.md 2020-09-10 20:29:39 +01:00
Kenny MacLeod
78af588f71 Merged master into issue/SCALE-33 2020-09-06 19:39:49 +00:00
Kenny MacLeod
10167db66d
SCALE-33 Add atl_license_key support to template 2020-09-06 20:32:51 +01:00